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

Commit 36481e0b authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Generate system stub library list at build time 

List of stub libraries from system (and bionic APEX) is currently
managed in static file. This change generates the list at build time and
adds to the system config so linkerconfig can use it.

Bug: 172889962
Test: Build cuttlefish and confirmed list is generated in
/system/etc/linker.config.pb

Change-Id: Idd5a93442f398dd8e88c767c694ddae64d1bb713
parent e13277f2

core/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -2467,6 +2467,15 @@ FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT) 
# -----------------------------------------------------------------

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

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



FULL_SYSTEMIMAGE_DEPS += $(SYSTEM_LINKER_CONFIG)



# installed file list

# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.

# We put installed-files.txt ahead of image itself in the dependency graph