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

Commit 54d69c62 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Append LLNDK libraries in the APEX to the system linker config" am:... 

Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b am: 987e4d6f

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



Change-Id: I3de47d78489aac6310f4e106cd351891e5b9df2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 225c50e7 987e4d6f

core/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -3074,12 +3074,15 @@ ifdef BUILDING_SYSTEM_IMAGE 




# Install system linker configuration

# Install system linker configuration

# Collect all available stub libraries installed in system and install with predefined linker configuration

# 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 := $(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 := $(call intermediates-dir-for,ETC,system_linker_config)/system_linker_config

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

$(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

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

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

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

	  --output $@ --value "$(STUB_LIBRARIES)" --system "$(TARGET_OUT)"

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





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

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

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

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