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

Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 373496e27d

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

Change-Id: I874290ba2d5fc797c844074cfcc068f7c110ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-12-01 19:57:02 +00:00
committed by Automerger Merge Worker
parent bc01e6ebdb 373496e27d
commit 1696314ba9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/base_rules.mk
View File

@@ -670,8 +670,14 @@ $(foreach td,$(LOCAL_TEST_DATA),$(eval $(copy_test_data_pairs)))
copy_test_data_pairs :=
my_installed_test_data := $(call copy-many-files,$(my_test_data_pairs))
$(LOCAL_INSTALLED_MODULE): $(my_installed_test_data)
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
my_installed_test_data := $(call copy-many-files,$(my_test_data_pairs))
$(LOCAL_INSTALLED_MODULE): $(my_installed_test_data)
else
# Skip installing test data for Soong modules, it's already been handled.
# Just compute my_installed_test_data.
my_installed_test_data := $(foreach f, $(my_test_data_pairs), $(call word-colon,2,$(f)))
endif
endif
endif