commit 6907cfe7de2007b0320f4606d9ea62da2062d3ca
author Jean-Baptiste Queru <jbq@google.com> Thu Jan 07 11:19:39 2010 -0800
committer Jean-Baptiste Queru <jbq@google.com> Mon Jan 11 09:40:39 2010 -0800
tree b9e0adc71a68b43bd8d6a82d4a01ac0e459bcf90
parent a831cbdcfc44e12c4bc556383558ec7b1e4bac3d

Remove special-case where CLASS=apps ignored TAGS=user

Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 180ed0b..f9a1fac 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -101,9 +101,13 @@
   $(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must contain exactly one word, not "$(LOCAL_MODULE_CLASS)")
 endif
 
-# Add a tag like "_class@APPS" to this module so that we can filter
-# based on the class.
-LOCAL_MODULE_TAGS += _class@$(LOCAL_MODULE_CLASS)
+# Those used to be implicitly ignored, but aren't any more.
+# As of 20100110 there are no apps with the user tag.
+ifeq ($(LOCAL_MODULE_CLASS),APPS)
+  ifneq ($(filter $(LOCAL_MODULE_TAGS),user),)
+    $(warning user tag on app $(LOCAL_MODULE) at $(LOCAL_PATH) - add your app to core.mk instead)
+  endif
+endif
 
 LOCAL_MODULE_PATH := $(strip $(LOCAL_MODULE_PATH))
 ifeq ($(LOCAL_MODULE_PATH),)

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 5e318f5..96019c0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -447,7 +447,7 @@
 # modules as a side-effect.  Do this after including ONE_SHOT_MAKEFILE
 # so that the modules will be installed in the same place they
 # would have been with a normal make.
-CUSTOM_MODULES := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS),))
+CUSTOM_MODULES := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))
 FULL_BUILD :=
 # Stub out the notice targets, which probably aren't defined
 # when using ONE_SHOT_MAKEFILE.
@@ -549,7 +549,7 @@
 endif
 # Use tags to get the non-APPS user modules.  Use the product
 # definition files to get the APPS user modules.
-user_MODULES := $(sort $(call get-tagged-modules,user,_class@APPS restricted))
+user_MODULES := $(sort $(call get-tagged-modules,user,restricted))
 user_MODULES := $(user_MODULES) $(user_PACKAGES)
 
 eng_MODULES := $(sort $(call get-tagged-modules,eng,restricted))