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

Commit f0f93940 authored by Ashutosh Agarwal's avatar Ashutosh Agarwal
Browse files

Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES. 

This allows products to specify additional device-specific stub libraries that should be included in the system_linker_config. This is useful for products that need to include additional stub libraries that are not picked up by Soong automatically.

Bug: 361441210
Change-Id: Ia18c476e249ac5b14b43819fa0a4f0059dc620de
parent 5b6b40e0

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3511,6 +3511,8 @@ $(SYSTEM_LINKER_CONFIG): $(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SO 
		--output $@ --value "$(STUB_LIBRARIES)" --system "$(TARGET_OUT)"

	$(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key requireLibs \

		--value "$(foreach lib,$(LLNDK_MOVED_TO_APEX_LIBRARIES), $(lib).so)"

	$(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key provideLibs \

		--value "$(foreach lib,$(PRODUCT_EXTRA_STUB_LIBRARIES), $(lib).so)"



$(call declare-1p-target,$(SYSTEM_LINKER_CONFIG),)

$(call declare-license-deps,$(SYSTEM_LINKER_CONFIG),$(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE))

core/product.mk

+4 −0
Original line number Diff line number Diff line
@@ -499,6 +499,10 @@ _product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER 
# If set, build would generate system image from Soong-defined module.

_product_single_value_vars += PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE



# List of stub libraries specific to the product that are already present in the system image and

# should be included in the system_linker_config.

_product_list_vars += PRODUCT_EXTRA_STUB_LIBRARIES



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)