Merge "Package dpi specific resources when Jack is enabled" (0f282ced) · Commits · e / os / android_build

core/dpi_specific_apk.mk

+8 −1

Original line number	Diff line number	Diff line
		@@ -30,14 +30,18 @@ $(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate)
		$(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\
		$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)

		$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE :=
		ifneq ($(full_classes_jar),)
		$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex)
		ifndef LOCAL_JACK_ENABLED
		# Use the jarjar processed arhive as the initial package file.
		$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar)
		else
		$(built_dpi_apk): PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc
		endif # LOCAL_JACK_ENABLED
		$(built_dpi_apk): $(built_dex)
		else
		$(built_dpi_apk): PRIVATE_DEX_FILE :=
		$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE :=
		endif # full_classes_jar

		# Set up dependenncies and the build recipe.
		@@ -56,6 +60,9 @@ ifneq ($(jni_shared_libraries),)
		endif
		ifneq ($(full_classes_jar),)
		$(add-dex-to-package)
		ifdef LOCAL_JACK_ENABLED
		$(add-carried-jack-resources)
		endif
		endif
		$(sign-package)
		$(align-package)