Fail the build when using a user tag on a non-legacy module. do not merge

The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c0b1c8d..246a1ef 100644 (file)
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -74,7 +74,9 @@ endif
 
 ifneq ($(filter $(LOCAL_MODULE_TAGS),user),)
   ifeq ($(filter $(GRANDFATHERED_USER_MODULES),$(LOCAL_MODULE)),)
-    $(warning using user tag on $(LOCAL_MODULE) at $(LOCAL_PATH))
+    $(warning *** Module name: $(LOCAL_MODULE))
+    $(warning *** Makefile location: $(LOCAL_PATH))
+    $(error user tag detected on new module - user tags are only supported on legacy modules)
   endif
 endif