am 742f5832: Raise progaurd library to platform libraries even for "current" SDK. (274be72a) · Commits · e / os / android_build

core/java.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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))