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

Commit 1696314b 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 am: 373496e2 

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



Change-Id: I874290ba2d5fc797c844074cfcc068f7c110ac00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc01e6eb 373496e2

core/base_rules.mk

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




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))

  my_installed_test_data := $(call copy-many-files,$(my_test_data_pairs))

  $(LOCAL_INSTALLED_MODULE): $(my_installed_test_data)

  $(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

endif

endif