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

Commit f1610d82 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add LOCAL_OVERRIDES_MODULES"

parents d79ce645 cbf76f63

core/base_rules.mk

+12 −0
Original line number Diff line number Diff line
@@ -243,6 +243,18 @@ intermediates := $(call local-intermediates-dir,,$(LOCAL_2ND_ARCH_VAR_PREFIX),$( 
intermediates.COMMON := $(call local-intermediates-dir,COMMON)

generated_sources_dir := $(call local-generated-sources-dir)



ifneq ($(LOCAL_OVERRIDES_MODULES),)

  ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

    ifndef LOCAL_IS_HOST_MODULE

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

    else

      $(call pretty-error,host modules cannot use LOCAL_OVERRIDES_MODULES)

    endif

  else

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

  endif

endif



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

# Pick a name for the intermediate and final targets

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

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ LOCAL_NOTICE_FILE:= 
LOCAL_ODM_MODULE:=

LOCAL_OEM_MODULE:=

LOCAL_OVERRIDES_PACKAGES:=

LOCAL_OVERRIDES_MODULES:=

LOCAL_PACKAGE_NAME:=

LOCAL_PACKAGE_SPLITS:=

LOCAL_PACK_MODULE_RELOCATIONS:=

core/main.mk

+3 −0
Original line number Diff line number Diff line
@@ -768,6 +768,9 @@ ifdef FULL_BUILD 
  # Filter out the overridden packages before doing expansion

  product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \

      $(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))

  # Filter out executables as well

  product_MODULES := $(filter-out $(foreach m, $(product_MODULES), \

      $(EXECUTABLES.$(m).OVERRIDES)), $(product_MODULES))



  # Resolve the :32 :64 module name

  modules_32 := $(patsubst %:32,%,$(filter %:32, $(product_MODULES)))