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

Commit 7c7dfcdf authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Enable overrides for ETC modules 

Bug: 143975137
Test: TreeHugger
Change-Id: I8290d06726d8aabe265022cd84ec2ea97eff7acf
parent 2bbfa528

core/base_rules.mk

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

core/main.mk

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



###########################################################