commit 5ad1d7ec00c17a442e29d82dc23a557def4abd31
author Joe Onorato <joeo@google.com> Fri Aug 17 05:46:29 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 17 05:46:29 2012 -0700
tree 275cc226193342d74ac9ea6729e98f930aed6cad
parent b68c3f9ca56f1110711a92f9f5deb922acced261
parent 726d921a47cb1003bcf7ff84ae1d332dec86d674

am 726d921a: am 45cd00cd: Merge "Install all host modules.  Don\'t filter out ones tagged "optional""

* commit '726d921a47cb1003bcf7ff84ae1d332dec86d674':
  Install all host modules.  Don't filter out ones tagged "optional"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 65679a9..808b952 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -509,9 +509,7 @@
 # All host modules that are not tagged with optional are automatically installed.
 # Save the installed files in ALL_HOST_INSTALLED_FILES.
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-  ifneq ($(filter optional,$(LOCAL_MODULE_TAGS)),optional)
-    ALL_HOST_INSTALLED_FILES += $(LOCAL_INSTALLED_MODULE)
-  endif
+  ALL_HOST_INSTALLED_FILES += $(LOCAL_INSTALLED_MODULE)
   ifneq ($(filter debug eng tests, $(LOCAL_MODULE_TAGS)),)
     $(warning $(LOCAL_MODULE_MAKEFILE): Module "$(LOCAL_MODULE)" has useless module tags: $(filter debug eng tests, $(LOCAL_MODULE_TAGS)). It will be installed anyway.)
     LOCAL_MODULE_TAGS := $(filter-out debug eng tests, $(LOCAL_MODULE_TAGS))