Merge "Move "include configure_local_jack.mk"" (5799af65) · Commits · e / os / android_build

core/static_java_library.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ LOCAL_UNINSTALLABLE_MODULE := true
		LOCAL_IS_STATIC_JAVA_LIBRARY := true
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		#################################
		include $(BUILD_SYSTEM)/configure_local_jack.mk
		#################################

		# Hack to build static Java library with Android resource
		# See bug 5714516
		all_resources :=
		@@ -59,10 +63,6 @@ endif

		LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)

		#################################
		include $(BUILD_SYSTEM)/configure_local_jack.mk
		#################################

		ifdef LOCAL_JACK_ENABLED
		ifndef LOCAL_JACK_PROGUARD_FLAGS
		LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)