Merge "Add LOCAL_OVERRIDES_MODULES" am: f1610d82f9
am: 9089f867d4
Change-Id: I3966676c72a0bb734da8c71765fc900fcfe85eb9
diff --git a/core/base_rules.mk b/core/base_rules.mk
index c327d2c..07d1cd9 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -243,6 +243,18 @@
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
generated_sources_dir := $(call local-generated-sources-dir)
+ifneq ($(LOCAL_OVERRIDES_MODULES),)
+ ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
+ ifndef LOCAL_IS_HOST_MODULE
+ EXECUTABLES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
+ else
+ $(call pretty-error,host modules cannot use LOCAL_OVERRIDES_MODULES)
+ endif
+ else
+ $(call pretty-error,LOCAL_MODULE_CLASS := $(LOCAL_MODULE_CLASS) cannot use LOCAL_OVERRIDES_MODULES)
+ endif
+endif
+
###########################################################
# Pick a name for the intermediate and final targets
###########################################################
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index ac3593b..cd001b2 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -171,6 +171,7 @@
LOCAL_ODM_MODULE:=
LOCAL_OEM_MODULE:=
LOCAL_OVERRIDES_PACKAGES:=
+LOCAL_OVERRIDES_MODULES:=
LOCAL_PACKAGE_NAME:=
LOCAL_PACKAGE_SPLITS:=
LOCAL_PACK_MODULE_RELOCATIONS:=
diff --git a/core/main.mk b/core/main.mk
index b50e0e7..9f20b65 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -776,6 +776,9 @@
# Filter out the overridden packages before doing expansion
product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \
$(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))
+ # Filter out executables as well
+ product_MODULES := $(filter-out $(foreach m, $(product_MODULES), \
+ $(EXECUTABLES.$(m).OVERRIDES)), $(product_MODULES))
# Resolve the :32 :64 module name
modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES)))