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

Commit 21823223 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dce am: cf0325c0 

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



Change-Id: Ib832bf7293b3c4f2d77949e7832b60452a80958b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9db5d017 cf0325c0

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -3513,17 +3513,17 @@ ifdef BOARD_USES_VENDOR_DLKMIMAGE 
  INTERNAL_VENDORIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT_VENDOR)/lib/modules,/vendor_dlkm/lib/modules,vendor_dlkm.img)

endif



# Install vendor/etc/linker.config.pb when PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS is set

ifneq ($(strip $(PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS)),)

# 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

	$(HOST_OUT_EXECUTABLES)/conv_linker_config proto \

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

		--output $@

	$(HOST_OUT_EXECUTABLES)/conv_linker_config systemprovide --source $@ \

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

$(call define declare-0p-target,$(vendor_linker_config_file),)

INTERNAL_VENDORIMAGE_FILES += $(vendor_linker_config_file)

endif



INSTALLED_FILES_FILE_VENDOR := $(PRODUCT_OUT)/installed-files-vendor.txt

INSTALLED_FILES_JSON_VENDOR := $(INSTALLED_FILES_FILE_VENDOR:.txt=.json)