Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8 (7e8cc8ce) · Commits · e / os / android_build

core/main.mk

+19 −26

Original line number	Diff line number	Diff line
		@@ -557,18 +557,14 @@ ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)
		define get-32-bit-modules
		$(sort $(foreach m,$(1),\
		$(if $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS),\
		$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX))\
		$(if $(ALL_MODULES.$(m)$(HOST_2ND_ARCH_MODULE_SUFFIX).CLASS),\
		$(m)$(HOST_2ND_ARCH_MODULE_SUFFIX))\
		))
		$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX))))
		endef
		# Get a list of corresponding 32-bit module names, if one exists;
		# otherwise return the original module name
		define get-32-bit-modules-if-we-can
		$(sort $(foreach m,$(1),\
		$(if $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS)$(ALL_MODULES.$(m)$(HOST_2ND_ARCH_MODULE_SUFFIX).CLASS),\
		$(if $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS),$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX)) \
		$(if $(ALL_MODULES.$(m)$(HOST_2ND_ARCH_MODULE_SUFFIX).CLASS),$(m)$(HOST_2ND_ARCH_MODULE_SUFFIX)),\
		$(if $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).CLASS),\
		$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX), \
		$(m))))
		endef
		else # TARGET_TRANSLATE_2ND_ARCH
		@@ -1114,7 +1110,7 @@ define product-installed-files
		$(eval _pif_modules += $(call get-32-bit-modules, $(_pif_modules_rest))) \
		$(eval _pif_modules += $(_pif_modules_rest)) \
		$(call expand-required-modules,_pif_modules,$(_pif_modules),$(_pif_overrides)) \
		$(call module-installed-files, $(_pif_modules)) \
		$(filter-out $(HOST_OUT_ROOT)/%,$(call module-installed-files, $(_pif_modules))) \
		$(call resolve-product-relative-paths,\
		$(foreach cf,$(PRODUCTS.$(_mk).PRODUCT_COPY_FILES),$(call word-colon,2,$(cf))))
		endef
		@@ -1178,28 +1174,25 @@ ifdef FULL_BUILD
		endif
		endif

		# Some modules produce only host installed files when building with TARGET_BUILD_APPS
		ifeq ($(TARGET_BUILD_APPS),)
		_modules := $(foreach m,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES) \
		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG) \
		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG_ASAN) \
		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_ENG) \
		$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_TESTS),\
		$(if $(ALL_MODULES.$(m).INSTALLED),\
		$(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\
		$(m))))
		$(call maybe-print-list-and-error,$(sort $(_modules)),\
		Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES)
		endif

		product_host_FILES := $(call host-installed-files,$(INTERNAL_PRODUCT))
		product_target_FILES := $(call product-installed-files, $(INTERNAL_PRODUCT))
		# WARNING: The product_MODULES variable is depended on by external files.
		product_MODULES := $(_pif_modules)

		# Verify that PRODUCT_HOST_PACKAGES is complete
		# This is a temporary requirement during migration
		# Ignore libraries, since they shouldn't need to be in PRODUCT_PACKAGES for the most part anyway.
		host_files_in_target_FILES := $(filter-out \
		$(HOST_OUT_SHARED_LIBRARIES)/% \
		$($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES)/%,\
		$(filter $(HOST_OUT_ROOT)/%,$(product_target_FILES)))
		ifneq (,$(filter-out $(product_host_FILES),$(host_files_in_target_FILES)))
		packages := $(foreach f,$(filter-out $(product_host_FILES),$(host_files_in_target_FILES)), \
		$(or $(INSTALLABLE_FILES.$(f).MODULE),$(f)))
		$(warning Missing modules from PRODUCT_HOST_PACKAGES)
		$(warning See $(CHANGES_URL)#PRODUCT_HOST_PACKAGES for more information)
		$(foreach f,$(sort $(packages)),$(warning _ $(f)))
		$(error stop)
		endif
		host_files_in_target_FILES :=

		# Verify the artifact path requirements made by included products.
		is_asan := $(if $(filter address,$(SANITIZE_TARGET)),true)
		ifneq (true,$(or $(is_asan),$(DISABLE_ARTIFACT_PATH_REQUIREMENTS)))

target/board/generic_x86/device.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,10 +19,6 @@ ifdef NET_ETH0_STARTONBOOT
		endif

		# Ensure we package the BIOS files too.
		PRODUCT_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \

		PRODUCT_HOST_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \

target/board/generic_x86_64/device.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -19,10 +19,6 @@ ifdef NET_ETH0_STARTONBOOT
		endif

		# Ensure we package the BIOS files too.
		PRODUCT_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \

		PRODUCT_HOST_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \

target/product/base_system.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		# Base modules and settings for the system partition.
		PRODUCT_PACKAGES += \
		abb \
		adb \
		adbd \
		am \
		android.hidl.allocator@1.0-service \
		@@ -35,12 +34,10 @@ PRODUCT_PACKAGES += \
		app_process \
		appwidget \
		ashmemd \
		atest \
		atrace \
		audioserver \
		BackupRestoreConfirmation \
		bcc \
		bit \
		blank_screen \
		blkid \
		bmgr \
		@@ -73,7 +70,6 @@ PRODUCT_PACKAGES += \
		e2fsck \
		ExtServices \
		ExtShared \
		fastboot \
		flags_health_check \
		framework \
		framework-res \
		@@ -94,7 +90,6 @@ PRODUCT_PACKAGES += \
		incident \
		incidentd \
		incident_helper \
		incident_report \
		init.environ.rc \
		init.rc \
		init_system \

target/product/full_x86.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -32,10 +32,6 @@ ifdef NET_ETH0_STARTONBOOT
		endif

		# Ensure we package the BIOS files too.
		PRODUCT_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \

		PRODUCT_HOST_PACKAGES += \
		bios.bin \
		vgabios-cirrus.bin \