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

Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" am: d1c2c4e1b8 am: 23eafdab4c am: 4b89b964c7

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

Change-Id: Ic1a1f6cbbdb51912d5a0ca05735bd923906e709c
This commit is contained in:
Colin Cross
2021-11-16 00:55:08 +00:00
committed by Automerger Merge Worker
parent 72afbf92c4 4b89b964c7
commit 113dc5c9ac
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/base_rules.mk
View File

@@ -932,9 +932,13 @@ ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))
# 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
# location during packaging. # location during packaging.
#
# Translate copies from $(LOCAL_PREBUILT_MODULE_FILE) to $(LOCAL_BUILT_MODULE)
# so that package-modules.mk gets any transtive dependencies added to
# $(LOCAL_BUILT_MODULE), for example unstripped symbols files.
ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \ ALL_MODULES.$(my_register_name).BUILT_INSTALLED := \
$(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \ $(strip $(ALL_MODULES.$(my_register_name).BUILT_INSTALLED) \
$(LOCAL_SOONG_INSTALL_PAIRS) \ $(patsubst $(LOCAL_PREBUILT_MODULE_FILE):%,$(LOCAL_BUILT_MODULE):%,$(LOCAL_SOONG_INSTALL_PAIRS)) \
$(my_init_rc_pairs) \ $(my_init_rc_pairs) \
$(my_test_data_pairs) \ $(my_test_data_pairs) \
$(my_vintf_pairs)) $(my_vintf_pairs))