Merge "Fix preopting Soong apps" am: e20c6588ce am: 2f21154e9c (dba3a408) · Commits · e / os / android_build

core/soong_app_prebuilt.mk

+6 −4

Original line number	Diff line number	Diff line
		@@ -43,8 +43,6 @@ endif
		endif # TURBINE_ENABLED != false


		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

		ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
		resource_export_package := $(intermediates.COMMON)/package-export.apk
		resource_export_stamp := $(intermediates.COMMON)/src/R.stamp
		@@ -61,14 +59,18 @@ endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

		java-dex: $(LOCAL_SOONG_DEX_JAR)

		ifdef LOCAL_DEX_PREOPT
		# defines built_odex along with rule to install odex
		include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk

		ifdef LOCAL_DEX_PREOPT
		$(built_odex): $(LOCAL_SOONG_DEX_JAR)
		$(call dexpreopt-one-file,$<,$@)
		$(eval $(call dexpreopt-copy-jar,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE),$(LOCAL_DEX_PREOPT)))
		else
		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
		endif


		PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
		ifdef LOCAL_CERTIFICATE
		PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE)