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

Commit efc141fb authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4e... 

Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4e am: 980e726a am: cf119eb1

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



Change-Id: I52c64f1276960a06b69fb9e5ac59d17dac2b55c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7f6f67d cf119eb1

core/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -3492,6 +3492,18 @@ 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)),)

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 $@

$(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)

$(INSTALLED_FILES_FILE_VENDOR): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_VENDOR)

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -373,6 +373,9 @@ _product_single_value_vars += PRODUCT_MODULE_BUILD_FROM_SOURCE 
# If true, installs a full version of com.android.virt APEX.

_product_single_value_vars += PRODUCT_AVF_ENABLED



# List of .json files to be merged/compiled into vendor/etc/linker.config.pb

_product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS



# Whether to use userfaultfd GC.

# Possible values are:

# - "default" or empty: both the build system and the runtime determine whether to use userfaultfd