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

Commit d0410768 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Gerrit Code Review
Browse files

Merge "Enable overrides for shared libraries"

parents 07d639a4 3142e294

core/base_rules.mk

+6 −4
Original line number Diff line number Diff line
@@ -277,14 +277,16 @@ 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

    ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

      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

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

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

    endif

  else

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

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

  endif

endif

core/main.mk

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

$(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES))

endef



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