StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e am: 5403b178a8 am: 8676bb08af

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I1f32cdc139ad9ef8fd97db067d0060fd23054e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-23 07:14:31 +00:00
committed by Automerger Merge Worker
parent add40e14c9 8676bb08af
commit 7beaebe190
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/base_rules.mk
View File

@@ -965,6 +965,9 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))
$(my_init_rc_installed) \ $(my_init_rc_installed) \
$(my_installed_test_data) \ $(my_installed_test_data) \
$(my_vintf_installed)) $(my_vintf_installed))
ALL_MODULES.$(my_register_name).INSTALLED_SYMLINKS := $(LOCAL_SOONG_INSTALL_SYMLINKS)
# Store the list of colon-separated pairs of the built and installed locations # Store the list of colon-separated pairs of the built and installed locations
# of files provided by this module. Used by custom packaging rules like # of files provided by this module. Used by custom packaging rules like
# package-modules.mk that need to copy the built files to a custom install # package-modules.mk that need to copy the built files to a custom install

6
core/main.mk
View File

@@ -1720,8 +1720,10 @@ else ifneq ($(TARGET_BUILD_APPS),)
unbundled_build_modules := $(sort $(TARGET_BUILD_APPS)) unbundled_build_modules := $(sort $(TARGET_BUILD_APPS))
endif endif
# Dist the installed files if they exist. # Dist the installed files if they exist, except the installed symlinks. dist-for-goals emits
apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED)) # `cp src dest` commands, which will fail to copy dangling symlinks.
apps_only_installed_files := $(foreach m,$(unbundled_build_modules),\
$(filter-out $(ALL_MODULES.$(m).INSTALLED_SYMLINKS),$(ALL_MODULES.$(m).INSTALLED)))
$(call dist-for-goals,apps_only, $(apps_only_installed_files)) $(call dist-for-goals,apps_only, $(apps_only_installed_files))
# Dist the bundle files if they exist. # Dist the bundle files if they exist.

9
target/product/gsi_release.mk
View File

@@ -28,10 +28,15 @@
BUILDING_GSI := true BUILDING_GSI := true
# Exclude all files under system/product and system/system_ext # Exclude all files under system/product and system/system_ext,
# and the vndk apex's compat symlinks
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/product/% \ system/product/% \
system/system_ext/% system/system_ext/% \
system/lib/vndk-29 \
system/lib/vndk-sp-29 \
system/lib64/vndk-29 \
system/lib64/vndk-sp-29
# GSI should always support up-to-date platform features. # GSI should always support up-to-date platform features.
# Keep this value at the latest API level to ensure latest build system # Keep this value at the latest API level to ensure latest build system