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

Commit 949199ec authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Don't install test data from Soong" into main am: 35ce86d6 

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



Change-Id: I26e688258633549d6666bf96dc8aa3665a76bf69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cf3c251 35ce86d6

core/base_rules.mk

+8 −2
Original line number Diff line number Diff line
@@ -670,8 +670,14 @@ $(foreach td,$(LOCAL_TEST_DATA),$(eval $(copy_test_data_pairs))) 


copy_test_data_pairs :=



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