tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Enable overrides for shared libraries"

Browse source 
am: d04107683b

Change-Id: I334167a048a2d7b02cc64c6b63ea04a5713d115a
This commit is contained in:
Dimitry Ivanov 2018-11-17 01:19:51 -08:00 committed by android-build-merger
commit 58d4948fca
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/base_rules.mk
View file

@ -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
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

2
core/main.mk
View file

@ -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
###########################################################