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

Commit 4ae1b2e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add partition compatibility symlinks to installed file list."

parents 3875d6c8 e64367cf

core/Makefile

+23 −8
Original line number Diff line number Diff line
@@ -2981,7 +2981,7 @@ endif # BUILDING_DEBUG_VENDOR_BOOT_IMAGE 


endif # BUILDING_DEBUG_BOOT_IMAGE || BUILDING_DEBUG_VENDOR_BOOT_IMAGE





PARTITION_COMPAT_SYMLINKS :=

# Creates a compatibility symlink between two partitions, e.g. /system/vendor to /vendor

# $1: from location (e.g $(TARGET_OUT)/vendor)

# $2: destination location (e.g. /vendor)
@@ -2999,6 +2999,7 @@ $1: 
	ln -sfn $2 $1

$1: .KATI_SYMLINK_OUTPUTS := $1

)

$(eval PARTITION_COMPAT_SYMLINKS += $1)

$1

endef
@@ -3109,17 +3110,23 @@ INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \ 


# Create symlink /system/vendor to /vendor if necessary.

ifdef BOARD_USES_VENDORIMAGE

  INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/vendor,/vendor,vendor.img)

  _vendor_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT)/vendor,/vendor,vendor.img)

  INTERNAL_SYSTEMIMAGE_FILES += $(_vendor_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_vendor_symlink)

endif



# Create symlink /system/product to /product if necessary.

ifdef BOARD_USES_PRODUCTIMAGE

  INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/product,/product,product.img)

  _product_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT)/product,/product,product.img)

  INTERNAL_SYSTEMIMAGE_FILES += $(_product_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_product_symlink)

endif



# Create symlink /system/system_ext to /system_ext if necessary.

ifdef BOARD_USES_SYSTEM_EXTIMAGE

  INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/system_ext,/system_ext,system_ext.img)

  _systemext_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT)/system_ext,/system_ext,system_ext.img)

  INTERNAL_SYSTEMIMAGE_FILES += $(_systemext_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_systemext_symlink)

endif



# -----------------------------------------------------------------
@@ -3132,7 +3139,9 @@ endif 
# - /system/lib/modules is a symlink to a directory that stores system DLKMs.

# - The system_dlkm partition is mounted at /system_dlkm at runtime.

ifdef BOARD_USES_SYSTEM_DLKMIMAGE

  INTERNAL_SYSTEMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT)/lib/modules,/system_dlkm/lib/modules,system_dlkm.img)

  _system_dlkm_lib_modules_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT)/lib/modules,/system_dlkm/lib/modules,system_dlkm.img)

  INTERNAL_SYSTEMIMAGE_FILES += $(_system_dlkm_lib_modules_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_system_dlkm_lib_modules_symlink)

endif



FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
@@ -3521,7 +3530,9 @@ INTERNAL_VENDORIMAGE_FILES := \ 


# Create symlink /vendor/odm to /odm if necessary.

ifdef BOARD_USES_ODMIMAGE

  INTERNAL_VENDORIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT_VENDOR)/odm,/odm,odm.img)

  _odm_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT_VENDOR)/odm,/odm,odm.img)

  INTERNAL_VENDORIMAGE_FILES += $(_odm_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_odm_symlink)

endif



# Create symlinks for vendor_dlkm on devices with a vendor_dlkm partition:
@@ -3539,7 +3550,9 @@ endif 
# The vendor DLKMs and other vendor_dlkm files must not be accessed using other paths because they

# are not guaranteed to exist on all devices.

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)

  _vendor_dlkm_lib_modules_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT_VENDOR)/lib/modules,/vendor_dlkm/lib/modules,vendor_dlkm.img)

  INTERNAL_VENDORIMAGE_FILES += $(_vendor_dlkm_lib_modules_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_vendor_dlkm_lib_modules_symlink)

endif



# Install vendor/etc/linker.config.pb with PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS and STUB_LIBRARIES
@@ -3760,7 +3773,9 @@ INTERNAL_ODMIMAGE_FILES := \ 
# The odm DLKMs and other odm_dlkm files must not be accessed using other paths because they

# are not guaranteed to exist on all devices.

ifdef BOARD_USES_ODM_DLKMIMAGE

  INTERNAL_ODMIMAGE_FILES += $(call create-partition-compat-symlink,$(TARGET_OUT_ODM)/lib/modules,/odm_dlkm/lib/modules,odm_dlkm.img)

  _odm_dlkm_lib_modules_symlink := $(call create-partition-compat-symlink,$(TARGET_OUT_ODM)/lib/modules,/odm_dlkm/lib/modules,odm_dlkm.img)

  INTERNAL_ODMIMAGE_FILES += $(_odm_dlkm_lib_modules_symlink)

  ALL_DEFAULT_INSTALLED_MODULES += $(_odm_dlkm_lib_modules_symlink)

endif



INSTALLED_FILES_FILE_ODM := $(PRODUCT_OUT)/installed-files-odm.txt

core/main.mk

+2 −1
Original line number Diff line number Diff line
@@ -2178,7 +2178,8 @@ $(PRODUCT_OUT)/sbom-metadata.csv: $(installed_files) 
	  $(eval _is_kernel_modules_blocklist := $(if $(findstring $f,$(ALL_KERNEL_MODULES_BLOCKLIST)),Y)) \

	  $(eval _is_fsverity_build_manifest_apk := $(if $(findstring $f,$(ALL_FSVERITY_BUILD_MANIFEST_APK)),Y)) \

	  $(eval _is_linker_config := $(if $(findstring $f,$(SYSTEM_LINKER_CONFIG) $(vendor_linker_config_file)),Y)) \

	  $(eval _is_platform_generated := $(_is_build_prop)$(_is_notice_file)$(_is_dexpreopt_image_profile)$(_is_product_system_other_avbkey)$(_is_event_log_tags_file)$(_is_system_other_odex_marker)$(_is_kernel_modules_blocklist)$(_is_fsverity_build_manifest_apk)$(_is_linker_config)) \

	  $(eval _is_partition_compat_symlink := $(if $(findstring $f,$(PARTITION_COMPAT_SYMLINKS)),Y)) \

	  $(eval _is_platform_generated := $(_is_build_prop)$(_is_notice_file)$(_is_dexpreopt_image_profile)$(_is_product_system_other_avbkey)$(_is_event_log_tags_file)$(_is_system_other_odex_marker)$(_is_kernel_modules_blocklist)$(_is_fsverity_build_manifest_apk)$(_is_linker_config)$(_is_partition_compat_symlink)) \

	  @echo /$(_path_on_device)$(comma)$(_module_path)$(comma)$(_soong_module_type)$(comma)$(_is_prebuilt_make_module)$(comma)$(_product_copy_files)$(comma)$(_kernel_module_copy_files)$(comma)$(_is_platform_generated) >> $@ $(newline) \

	  $(if $(_post_installed_dexpreopt_zip), \

	  for i in $$(zipinfo -1 $(_post_installed_dexpreopt_zip)); do echo /$$i$(comma)$(_module_path)$(comma)$(_soong_module_type)$(comma)$(_is_prebuilt_make_module)$(comma)$(_product_copy_files)$(comma)$(_kernel_module_copy_files)$(comma)$(_is_platform_generated) >> $@ ; done $(newline) \