diff options
| author | Ying Wang <wangying@google.com> | 2011-09-07 10:21:42 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-09-07 10:32:39 -0700 |
| commit | 162991beb523ad1b88507c3855423866c856b107 (patch) | |
| tree | 62c83ed249a25b7e77b45b01faa8c2c7a7521cf7 /core | |
| parent | 2306106d3e2cd774ef0b2cd782442f90c402341f (diff) | |
| download | build-162991beb523ad1b88507c3855423866c856b107.zip build-162991beb523ad1b88507c3855423866c856b107.tar.gz build-162991beb523ad1b88507c3855423866c856b107.tar.bz2 | |
Allow uninstallable APPs.
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.
Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 3c11673..d0dd703 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -194,14 +194,8 @@ endif 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_MODULE_SUBDIR)$(LOCAL_INSTALLED_MODULE_STEM) endif |