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

Commit cc61d50e 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 

am: 093994a4

Change-Id: Ic87d5893599ec10d9c0241c370e43a967e04b1b2
parents 0cc1c383 093994a4

core/base_rules.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -321,6 +321,8 @@ ifneq ($(LOCAL_OVERRIDES_MODULES),) 
      EXECUTABLES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))

      EXECUTABLES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))

    else ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

    else ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

      SHARED_LIBRARIES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))

      SHARED_LIBRARIES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))

    else ifeq ($(LOCAL_MODULE_CLASS),ETC)

      ETC.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))

    else

    else

      $(call pretty-error,LOCAL_MODULE_CLASS := $(LOCAL_MODULE_CLASS) cannot use LOCAL_OVERRIDES_MODULES)

      $(call pretty-error,LOCAL_MODULE_CLASS := $(LOCAL_MODULE_CLASS) cannot use LOCAL_OVERRIDES_MODULES)

    endif

    endif

core/main.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -969,7 +969,7 @@ $(foreach export,$(EXPORTS_LIST),$(eval $(call add-dependency,$$(EXPORTS.$$(expo 
# Expand a list of modules to the modules that they override (if any)

# Expand a list of modules to the modules that they override (if any)

# $(1): The list of modules.

# $(1): The list of modules.

define module-overrides

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

endef





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

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