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

Commit 6dc51855 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use Make path for system_linker_config"

parents 33b6aaff d4a054fb

core/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -2936,12 +2936,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)