commit b531c0b44c28323432c92db5dd05bce78b894041
author Brian Carlstrom <bdc@google.com> Mon Dec 13 13:20:21 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 13 13:20:21 2010 -0800
tree 54b55ca4f278417ac953b6e075825b05920b924c
parent 87c983ca57092d13d2baa00cca13af22cc441fe2
parent 782695112d42ea3b9992e7c5f10a76f1854343d4

Merge "Unify target and host Java compilation"

core/base_rules.mk

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
 

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 6635d2c..e2b0f5a 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -36,7 +36,6 @@
     Music \
     Provision \
     Phone \
-    Protips \
     QuickSearchBox \
     Settings \
     Sync \