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

Commit 27a6e992 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Remove system_linker_config module" into main am: 1a68593b am: 8d88f31e 

Original change: https://android-review.googlesource.com/c/platform/build/+/3412553



Change-Id: Ie10b52a018ecade8478d8e3b770bfc906022f2aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a8e4f16 8d88f31e

core/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -3504,18 +3504,20 @@ ifdef BUILDING_SYSTEM_IMAGE 
# Collect all available stub libraries installed in system and install with predefined linker configuration

# Also append LLNDK libraries in the APEX as required libs

SYSTEM_LINKER_CONFIG := $(TARGET_OUT)/etc/linker.config.pb

SYSTEM_LINKER_CONFIG_SOURCE := $(call intermediates-dir-for,ETC,system_linker_config)/system_linker_config

SYSTEM_LINKER_CONFIG_SOURCE := system/core/rootdir/etc/linker.config.json

$(SYSTEM_LINKER_CONFIG): PRIVATE_SYSTEM_LINKER_CONFIG_SOURCE := $(SYSTEM_LINKER_CONFIG_SOURCE)

$(SYSTEM_LINKER_CONFIG): $(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE) | conv_linker_config

	@echo Creating linker config: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(HOST_OUT_EXECUTABLES)/conv_linker_config systemprovide --source $(PRIVATE_SYSTEM_LINKER_CONFIG_SOURCE) \

	@rm -f $@ $@.step1

	$(HOST_OUT_EXECUTABLES)/conv_linker_config proto --force -s $(PRIVATE_SYSTEM_LINKER_CONFIG_SOURCE) -o $@.step1

	$(HOST_OUT_EXECUTABLES)/conv_linker_config systemprovide --source $@.step1 \

		--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)"

	rm -f $@.step1



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

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