diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-11-19 00:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-19 00:46:27 +0000 |
| commit | cd04684215e367235224ab660f76f93534c1eed6 (patch) | |
| tree | 8f025f9765f095850140b59fc1c4758e57f0e7e5 | |
| parent | 3f8eb7ec99b1dafbaffa098cff126e852284a704 (diff) | |
| parent | 18c14ea7a8e92222b1e551d36ff33e1a9c8208bd (diff) | |
| download | build-android10-dev.tar.gz | |
Merge "Enable overrides for ETC modules" into android10-devandroid10-dev
| -rw-r--r-- | core/base_rules.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 94aa1e4a92..782e5320f9 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -336,6 +336,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 df5c13cc2a..791a2db234 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1055,7 +1055,7 @@ $(foreach lt,$(ALL_LINK_TYPES),\ # 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 ########################################################### |