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/java.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/java.mk')
| -rw-r--r-- | core/java.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index 73b8780..66993e7 100644 --- a/core/java.mk +++ b/core/java.mk @@ -447,7 +447,7 @@ ifdef TARGET_BUILD_APPS else # For platform build, we can't just raise to the "current" SDK, # that would break apps that use APIs removed from the current SDK. - my_support_library_sdk_raise := $(call java-lib-files,framework) + my_support_library_sdk_raise := $(call java-lib-files,$(TARGET_DEFAULT_JAVA_LIBRARIES)) endif endif endif |