commit 744e6460320e6ac2d1b7050a80d8d70eb8321eeb
author Ying Wang <wangying@google.com> Mon Sep 13 17:24:04 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 13 17:24:04 2010 -0700
tree 6b2d14826687e92fcfb0e96f88c4f1ccb918f40c
parent 2a0b83e57e7ba65296528995f865ba32fb9ff4a4
parent 74005c3c2df04e035000426909a060f6149fd1d6

am 74005c3c: am 528362f0: Default host module tag to optional.

Merge commit '74005c3c2df04e035000426909a060f6149fd1d6'

* commit '74005c3c2df04e035000426909a060f6149fd1d6':
  Default host module tag to optional.

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 04270f0..19206e8 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -57,9 +57,12 @@
 
 LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS))
 ifeq (,$(LOCAL_MODULE_TAGS))
+ifeq (,$(LOCAL_IS_HOST_MODULE))
 # Modules without tags fall back to user (which is changed to user eng below)
 LOCAL_MODULE_TAGS := user
-#$(warning default tags: $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))))
+else
+LOCAL_MODULE_TAGS := optional
+endif
 endif
 
 # Only the tags mentioned in this test are expected to be set by module