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

Commit 864e5b9a authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Remove the old output of conv_linker_config" am: 580af1ba am: 774c439b 

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



Change-Id: I23855e8f7e11951e98e97bb195cf8304faa134fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e52f880 774c439b

core/Makefile

+9 −3
Original line number Diff line number Diff line
@@ -3132,6 +3132,9 @@ 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): 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) \

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

	$(HOST_OUT_EXECUTABLES)/conv_linker_config append --source $@ --output $@ --key requireLibs \
@@ -3517,6 +3520,9 @@ endif 
vendor_linker_config_file := $(TARGET_OUT_VENDOR)/etc/linker.config.pb

$(vendor_linker_config_file): private_linker_config_fragments := $(PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS)

$(vendor_linker_config_file): $(INTERNAL_VENDORIMAGE_FILES) $(PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS) | $(HOST_OUT_EXECUTABLES)/conv_linker_config

	@echo Creating linker config: $@

	@mkdir -p $(dir $@)

	@rm -f $@

	$(HOST_OUT_EXECUTABLES)/conv_linker_config proto \

		--source $(call normalize-path-list,$(private_linker_config_fragments)) \

		--output $@