StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable overrides for shared libraries

Browse Source 
Bug: http://b/114470065
Test: make
Change-Id: I084c98ca2630ad3f56504ca0f7f08cff14483872
This commit is contained in:
dimitry
2018-11-07 10:39:34 +01:00
parent 20e7b65663
commit 3142e2949d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/base_rules.mk
View File

@@ -277,15 +277,17 @@ intermediates.COMMON := $(call local-intermediates-dir,COMMON)
generated_sources_dir := $(call local-generated-sources-dir) generated_sources_dir := $(call local-generated-sources-dir)
ifneq ($(LOCAL_OVERRIDES_MODULES),) 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)) EXECUTABLES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
else else ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)
$(call pretty-error,host modules cannot use LOCAL_OVERRIDES_MODULES) SHARED_LIBRARIES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_MODULES))
endif
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
else
$(call pretty-error,host modules cannot use LOCAL_OVERRIDES_MODULES)
endif
endif endif
########################################################### ###########################################################

2
core/main.mk
View File

@@ -965,7 +965,7 @@ $(foreach lt,$(ALL_LINK_TYPES),\
# 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)) $(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES))
endef endef
########################################################### ###########################################################