Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 162991be authored by Ying Wang's avatar Ying Wang
Browse files

Allow uninstallable APPs. 

Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.

Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
parent 2306106d

core/base_rules.mk

+1 −7
Original line number Diff line number Diff line
@@ -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