commit 8e5b540cffeac75f698020b9fbbb24dcd7d6b061
author Ying Wang <wangying@google.com> Thu Sep 08 14:48:38 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 08 14:48:38 2011 -0700
tree 863e55a78659497a59529a7982dcda6ed6ef66b2
parent d62de0f88450e310188234ee1b3d5afdd0312b9a
parent 41346ae4077c7dee66a7c04dc91714569dca9303

am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp

* commit '41346ae4077c7dee66a7c04dc91714569dca9303':
  Allow uninstallable APPs.

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 635a256..8039d65 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -194,14 +194,8 @@
 LOCAL_BUILT_MODULE := $(built_module_path)/$(LOCAL_BUILT_MODULE_STEM)
 built_module_path :=
 
-# LOCAL_UNINSTALLABLE_MODULE is only allowed to be used by the
-# internal STATIC_LIBRARIES build files.
 LOCAL_UNINSTALLABLE_MODULE := $(strip $(LOCAL_UNINSTALLABLE_MODULE))
-ifdef LOCAL_UNINSTALLABLE_MODULE
-  ifeq (,$(filter $(LOCAL_MODULE_CLASS),JAVA_LIBRARIES STATIC_LIBRARIES))
-    $(error $(LOCAL_PATH): Illegal use of LOCAL_UNINSTALLABLE_MODULE)
-  endif
-else
+ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
   LOCAL_INSTALLED_MODULE := $(LOCAL_MODULE_PATH)/$(LOCAL_INSTALLED_MODULE_STEM)
 endif