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

Commit 093994a4 authored by Jaewoong Jung's avatar Jaewoong Jung Committed by android-build-merger
Browse files

Merge "Enable overrides for ETC modules" am: 0c9d914e 

am: 2e007a7b

Change-Id: I3e2c21402a9fa20ba2b6115e5daa77ef6d97e9da
parents 6f136141 2e007a7b

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
@@ -967,7 +967,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



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