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

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

Change-Id: I9b248d401a5f81e5e194fc9e8ee8903ecd80bd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-23 06:36:47 +00:00
committed by Automerger Merge Worker
parent 48ba4aced4 5403b178a8
commit 8676bb08af
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_installed_test_data) \
$(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
# 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

6
core/main.mk
View File

@@ -1720,8 +1720,10 @@ else ifneq ($(TARGET_BUILD_APPS),)
unbundled_build_modules := $(sort $(TARGET_BUILD_APPS))
endif
# Dist the installed files if they exist.
apps_only_installed_files := $(foreach m,$(unbundled_build_modules),$(ALL_MODULES.$(m).INSTALLED))
# Dist the installed files if they exist, except the installed symlinks. dist-for-goals emits
# `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))
# Dist the bundle files if they exist.