commit 589e8c52fb5eeb4027721bac52851ad977f53bbb
author Ying Wang <wangying@google.com> Tue May 19 16:03:57 2015 -0700
committer Ying Wang <wangying@google.com> Tue May 19 16:03:57 2015 -0700
tree 5e4bcfadbc2edf128d55ea8c5cba59c7cf99829d
parent 7e72d990aff9cc9152c534678417b9e5448e0e42

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

core/java.mk

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 @@
 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