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

Commit 2062646c authored by Colin Cross's avatar Colin Cross
Browse files

Don't install test data from Soong 

Soong has already created the test data installation rules.  Make still
handles packaging the test data into test suites.

Bug: 311428265
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: Ida0469e600b1dec4ce4e450a6c517ae13c133ded
parent 3a2ff8e2

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