Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk" (8bc94444) · Commits · e / os / android_build

core/soong_app_prebuilt.mk

+16 −13

Original line number	Diff line number	Diff line
		@@ -27,8 +27,22 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar
		full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar
		full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

		ifdef LOCAL_SOONG_CLASSES_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))
		$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))
		$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))

		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		$(eval $(call add-dependency,$(full_classes_jar),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_ENABLED != false
		endif

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

		ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
		@@ -44,15 +58,6 @@ ifdef LOCAL_SOONG_PROGUARD_DICT
		$(intermediates.COMMON)/proguard_dictionary)
		endif

		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_ENABLED != false


		ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
		resource_export_package := $(intermediates.COMMON)/package-export.apk
		resource_export_stamp := $(intermediates.COMMON)/src/R.stamp
		@@ -74,8 +79,6 @@ ifneq ($(BUILD_PLATFORM_ZIP),)
		$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk))
		endif

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

		my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\
		$(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))
		my_installed := $(call copy-many-files, $(my_built_installed))

core/soong_java_prebuilt.mk

+43 −48

Original line number	Diff line number	Diff line
		@@ -24,8 +24,22 @@ common_javalib.jar := $(intermediates.COMMON)/javalib.jar
		hiddenapi_flags_csv := $(intermediates.COMMON)/hiddenapi/flags.csv
		hiddenapi_metadata_csv := $(intermediates.COMMON)/hiddenapi/greylist.csv

		ifdef LOCAL_SOONG_CLASSES_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))
		$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))
		$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar)))

		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		$(eval $(call add-dependency,$(full_classes_jar),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_ENABLED != false
		endif

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

		ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
		@@ -64,16 +78,8 @@ ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE
		$(call add-dependency,$(LOCAL_BUILT_MODULE),$(my_static_library_android_manifest))
		endif # LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE

		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_ENABLED != false

		ifdef LOCAL_SOONG_DEX_JAR
		ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)
		ifndef LOCAL_IS_HOST_MODULE
		ifneq ($(filter $(LOCAL_MODULE),$(PRODUCT_BOOT_JARS)),) # is_boot_jar
		# Derive greylist from classes.jar.
		@@ -96,17 +102,9 @@ ifdef LOCAL_SOONG_DEX_JAR
		else # !is_boot_jar
		$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
		endif # is_boot_jar
		$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))

		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
		$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(common_javalib.jar)))
		else # LOCAL_IS_HOST_MODULE
		$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))
		$(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))
		endif

		java-dex : $(LOCAL_BUILT_MODULE)
		else # LOCAL_UNINSTALLABLE_MODULE
		$(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))

		ifneq ($(filter $(LOCAL_MODULE),$(HIDDENAPI_EXTRA_APP_USAGE_JARS)),)
		# Derive greylist from classes.jar.
		@@ -115,18 +113,15 @@ ifdef LOCAL_SOONG_DEX_JAR
		# java.mk.
		$(eval $(call hiddenapi-generate-csv,$(full_classes_jar),$(hiddenapi_flags_csv),$(hiddenapi_metadata_csv)))
		endif
		endif

		$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
		$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
		java-dex : $(common_javalib.jar)
		endif # LOCAL_UNINSTALLABLE_MODULE
		java-dex : $(LOCAL_BUILT_MODULE)
		else # LOCAL_SOONG_DEX_JAR
		ifndef LOCAL_UNINSTALLABLE_MODULE
		ifndef LOCAL_IS_HOST_MODULE
		$(call pretty-error,Installable device module must have LOCAL_SOONG_DEX_JAR set)
		endif
		endif
		$(eval $(call copy-one-file,$(full_classes_jar),$(LOCAL_BUILT_MODULE)))
		endif # LOCAL_SOONG_DEX_JAR

		my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\