Raise progaurd library to platform libraries even for "current" SDK.

[android-x86/build.git] / core / java.mk

diff --git a/core/java.mk b/core/java.mk
index ae4a602..b371289 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -441,9 +441,10 @@ proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary
 my_support_library_sdk_raise :=
 ifneq (,$(filter android-support-%,$(LOCAL_STATIC_JAVA_LIBRARIES)))
 ifdef LOCAL_SDK_VERSION
-ifeq (,$(filter current system_current, $(LOCAL_SDK_VERSION)))
 ifdef TARGET_BUILD_APPS
+ifeq (,$(filter current system_current, $(LOCAL_SDK_VERSION)))
   my_support_library_sdk_raise := $(call java-lib-files, sdk_vcurrent)
+endif
 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.
@@ -451,7 +452,6 @@ else
 endif
 endif
 endif
-endif
 
 # jack already has the libraries in its classpath and doesn't support jars
 legacy_proguard_flags := $(addprefix -libraryjars ,$(my_support_library_sdk_raise) $(full_shared_java_libs))