commit 093994a48eca5909f6e3b54e352c819449fea7c3
author Jaewoong Jung <jungjw@google.com> Wed Nov 06 18:45:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 06 18:45:55 2019 -0800
tree eee47c1e02a9bf0297e0b7ecc9a565c3749d9b6e
parent 6f136141898536a18e565ba67085687bc8c70472
parent 2e007a7b042617e6726c380911c64b521571902f

Merge "Enable overrides for ETC modules" am: 0c9d914eef
am: 2e007a7b04

Change-Id: I3e2c21402a9fa20ba2b6115e5daa77ef6d97e9da

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 32c5807..6b80a15 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -321,6 +321,8 @@
       EXECUTABLES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
     else ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)
       SHARED_LIBRARIES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
+    else ifeq ($(LOCAL_MODULE_CLASS),ETC)
+      ETC.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
     else
       $(call pretty-error,LOCAL_MODULE_CLASS := $(LOCAL_MODULE_CLASS) cannot use LOCAL_OVERRIDES_MODULES)
     endif

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e4cd6ad..730cbd0 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -967,7 +967,7 @@
 # Expand a list of modules to the modules that they override (if any)
 # $(1): The list of modules.
 define module-overrides
-$(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES))
+$(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES) $(ETC.$(m).OVERRIDES))
 endef
 
 ###########################################################