diff options
| author | Ying Wang <wangying@google.com> | 2015-05-19 16:03:57 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-05-19 16:03:57 -0700 |
| commit | 589e8c52fb5eeb4027721bac52851ad977f53bbb (patch) | |
| tree | 5e4bcfadbc2edf128d55ea8c5cba59c7cf99829d /core/config.mk | |
| parent | 7e72d990aff9cc9152c534678417b9e5448e0e42 (diff) | |
| download | build-589e8c52fb5eeb4027721bac52851ad977f53bbb.zip build-589e8c52fb5eeb4027721bac52851ad977f53bbb.tar.gz build-589e8c52fb5eeb4027721bac52851ad977f53bbb.tar.bz2 | |
Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
dir.
Bug: 20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 3892204..c3ed00f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -623,6 +623,13 @@ include $(BUILD_SYSTEM)/clang/config.mk HISTORICAL_SDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/sdk HISTORICAL_NDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/ndk +# The path where app can reference the support library resources. +ifdef TARGET_BUILD_APPS +SUPPORT_LIBRARY_ROOT := $(HISTORICAL_SDK_VERSIONS_ROOT)/current/support +else +SUPPORT_LIBRARY_ROOT := frameworks/support +endif + # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N. # The 'current' version is whatever this source tree is. # |