Don't give the user tag to host modules automatically. (f85cb7c9) · Commits · e / os / android_build

core/base_rules.mk

+23 −8

Original line number	Diff line number	Diff line
		@@ -61,12 +61,16 @@ ifeq (,$(LOCAL_MODULE_TAGS))
		ifeq (true,$(LOCAL_UNINSTALLABLE_MODULE))
		LOCAL_MODULE_TAGS := optional
		else
		# Installable modules without tags fall back to user (which is changed to user eng below)
		ifneq ($(LOCAL_IS_HOST_MODULE),true)
		# Installable target modules without tags fall back to user (which is changed to user eng
		# below)
		LOCAL_MODULE_TAGS := user
		endif
		endif
		#$(warning default tags: $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))))
		endif


		# Only the tags mentioned in this test are expected to be set by module
		# makefiles. Anything else is either a typo or a source of unexpected
		# behaviors.
		@@ -92,7 +96,7 @@ ifneq ($(filter $(LOCAL_MODULE_TAGS),user),)
		$(warning * Android.mk for the affected module, and add)
		$(warning * the LOCAL_MODULE value for that component)
		$(warning * into the PRODUCT_PACKAGES section of product)
		$(warning * makefile(s) where it's necessary, if)
		$(warning * makefile(s) where it is necessary, if)
		$(warning * appropriate.)
		$(warning * )
		$(warning * If the component should be in EVERY build of ALL)
		@@ -544,6 +548,17 @@ $(installed_odex) : $(built_odex) \| $(ACP)
		$(LOCAL_INSTALLED_MODULE) : $(installed_odex)
		endif

		# All host modules that are not tagged with optional are automatically installed.
		# Save the installed files in ALL_HOST_INSTALLED_FILES.
		ifeq ($(LOCAL_IS_HOST_MODULE),true)
		ifneq ($(filter optional,$(LOCAL_MODULE_TAGS)),optional)
		ALL_HOST_INSTALLED_FILES += $(LOCAL_INSTALLED_MODULE)
		endif
		ifneq ($(filter user debug eng tests, $(LOCAL_MODULE_TAGS)),)
		$(error $(LOCAL_MODULE_MAKEFILE): Module "$(LOCAL_MODULE)" has useless module tags: $(filter user debug eng tests, $(LOCAL_MODULE_TAGS)). It will be installed anyway.)
		endif
		endif

		endif # !LOCAL_UNINSTALLABLE_MODULE

core/definitions.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,11 @@ ALL_MODULE_TAGS:=
		# its sub-variables.)
		ALL_MODULE_NAME_TAGS:=

		# All host modules are automatically installed (i.e. outside
		# of the product configuration scheme). This is a list of the
		# install targets (LOCAL_INSTALLED_MODULE).
		ALL_HOST_INSTALLED_FILES:=

		# Full paths to all prebuilt files that will be copied
		# (used to make the dependency on acp)
		ALL_PREBUILT:=

core/main.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -660,6 +660,8 @@ ifdef is_sdk_build
		$(error Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))
		endif

		# Install all of the host modules
		modules_to_install += $(sort $(modules_to_install) $(ALL_HOST_INSTALLED_FILES))

		# build/core/Makefile contains extra stuff that we don't want to pollute this
		# top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES