am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
diff --git a/core/base_rules.mk b/core/base_rules.mk
index 7782c33..d00f2a3 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -57,8 +57,12 @@
LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS))
ifeq (,$(LOCAL_MODULE_TAGS))
-# Modules without tags fall back to user (which is changed to user eng below)
+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)
LOCAL_MODULE_TAGS := user
+endif
#$(warning default tags: $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))))
endif