From 22bafec0425313fb49b6f64a609537ee1b60a76e Mon Sep 17 00:00:00 2001 From: yangbill Date: Fri, 11 Feb 2022 18:06:07 +0800 Subject: Propagate data_bins from Soong to Make Write the list of a test module's data_bins value to the `LOCAL_TEST_DATA_BINS` Makefile variable defined for each module. This enables downstream tools to correctly set up the runtime environment for execution. And currently only sh_test, cc_tests, and rust_tests has this attribute in Android.bp. Bug: 215234071 Test: m out/soong/Android-aosp_cf_x86_64_phone.mk Change-Id: I8d47f5f9b25afdc5975c6b414405badb38dbde4b --- rust/androidmk.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'rust/androidmk.go') diff --git a/rust/androidmk.go b/rust/androidmk.go index 4e5863215..2361e0377 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -106,6 +106,9 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM } entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !BoolDefault(test.Properties.Auto_gen_config, true)) entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", Bool(test.Properties.Test_options.Unit_test)) + if test.Properties.Data_bins != nil { + entries.AddStrings("LOCAL_TEST_DATA_BINS", test.Properties.Data_bins...) + } }) cc.AndroidMkWriteTestData(test.data, ret) -- cgit v1.2.3-59-g8ed1b