From 7c7dfcdf5440dc4e4dbca12523889959345a21ed Mon Sep 17 00:00:00 2001
From: Jaewoong Jung <jungjw@google.com>
Date: Wed, 6 Nov 2019 14:08:59 -0800
Subject: [PATCH] Enable overrides for ETC modules

Bug: 143975137
Test: TreeHugger
Change-Id: I8290d06726d8aabe265022cd84ec2ea97eff7acf
---
 core/base_rules.mk | 2 ++
 core/main.mk       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 32c580734..6b80a1580 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -321,6 +321,8 @@ ifneq ($(LOCAL_OVERRIDES_MODULES),)
       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
diff --git a/core/main.mk b/core/main.mk
index 54023e62c..fd02a8320 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -970,7 +970,7 @@ $(foreach export,$(EXPORTS_LIST),$(eval $(call add-dependency,$$(EXPORTS.$$(expo
 # 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
 
 ###########################################################