commit e893cd2d5e2c4433536649c7f2aa7b97bb5b8171
author Jean-Baptiste Queru <jbq@google.com> Tue Sep 14 09:44:07 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 14 09:44:07 2010 -0700
tree cb40a790990e9a2279549fd6180afc113f843f39
parent f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1
parent 6e8b268dec3cc38151dfd0514621219b79a30fa9

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

Merge commit '6e8b268dec3cc38151dfd0514621219b79a30fa9' into gingerbread-plus-aosp

* commit '6e8b268dec3cc38151dfd0514621219b79a30fa9':
  Fail the build when using a user tag on a non-legacy module. do not merge

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 97bcb29..3b5bd42 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -74,7 +74,9 @@
 
 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