From d4a054fb406ee556454f4d25ae8c55c2e0d01534 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 15 Mar 2022 15:07:07 -0700 Subject: [PATCH] Use Make path for system_linker_config Use the Make path for system_linker_config instead of a variable exported by Soong so that the license information is correctly associated. Test: m alllicensemetadata reportmissinglicenses Change-Id: I3d375220d829b2ef88b500ef6c1ea6bf8f46e6ac --- core/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 9db001809d..323b5e0cf5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2928,12 +2928,14 @@ ifdef BUILDING_SYSTEM_IMAGE # Install system linker configuration # Collect all available stub libraries installed in system and install with predefined linker configuration SYSTEM_LINKER_CONFIG := $(TARGET_OUT)/etc/linker.config.pb -$(SYSTEM_LINKER_CONFIG) : $(INTERNAL_SYSTEMIMAGE_FILES) $(LINKER_CONFIG_PATH_system_linker_config) | conv_linker_config - $(HOST_OUT_EXECUTABLES)/conv_linker_config systemprovide --source $(LINKER_CONFIG_PATH_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) : $(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE) | conv_linker_config + $(HOST_OUT_EXECUTABLES)/conv_linker_config systemprovide --source $(PRIVATE_SYSTEM_LINKER_CONFIG_SOURCE) \ --output $@ --value "$(STUB_LIBRARIES)" --system "$(TARGET_OUT)" $(call declare-1p-target,$(SYSTEM_LINKER_CONFIG),) -$(call declare-license-deps,$(SYSTEM_LINKER_CONFIG),$(INTERNAL_SYSTEMIMAGE_FILES) $(LINKER_CONFIG_PATH_system_linker_config)) +$(call declare-license-deps,$(SYSTEM_LINKER_CONFIG),$(INTERNAL_SYSTEMIMAGE_FILES) $(SYSTEM_LINKER_CONFIG_SOURCE)) FULL_SYSTEMIMAGE_DEPS += $(SYSTEM_LINKER_CONFIG)