From 63975d73b1a0b062d6ff058a73cfbbc1fe9281d9 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 7 Mar 2023 18:25:02 +0900 Subject: [PATCH] Add dependency to /vendor/etc/linker.config.pb The rule for the file should depend on vendor files. Otherwise, the rule can be fired before installation of those stub libraries in /vendor/lib. Bug: 244531518 Test: m (with a vendor lib with stubs) Test: check /vendor/etc/linker.config.pb (should have the lib) $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 48b383b8c5..b3465001f4 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3516,7 +3516,7 @@ endif # Install vendor/etc/linker.config.pb with PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS and STUB_LIBRARIES 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): $(PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS) | $(HOST_OUT_EXECUTABLES)/conv_linker_config +$(vendor_linker_config_file): $(INTERNAL_VENDORIMAGE_FILES) $(PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS) | $(HOST_OUT_EXECUTABLES)/conv_linker_config $(HOST_OUT_EXECUTABLES)/conv_linker_config proto \ --source $(call normalize-path-list,$(private_linker_config_fragments)) \ --output $@