From 0ac5a431a98d6f0fbc9434d4c7955981117f781f Mon Sep 17 00:00:00 2001 From: Zhenhuang Wang Date: Fri, 12 Aug 2022 18:49:20 +0800 Subject: Move common test_options properties into the android package Multiple modules (e.g. java, cc, python, rust) define the `test_options` field. Extract the common properties in test_options to share across different test rules. Bug: 240928948 Test: `refreshmod` and diff with original module-info.json Change-Id: I404a7a157b4ccaa53d800ee2217559ff695bd825 --- rust/androidmk.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rust/androidmk.go') diff --git a/rust/androidmk.go b/rust/androidmk.go index 2361e0377..32c746ed4 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -105,10 +105,11 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM entries.SetString("LOCAL_FULL_TEST_CONFIG", test.testConfig.String()) } 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...) } + + test.Properties.Test_options.SetAndroidMkEntries(entries) }) cc.AndroidMkWriteTestData(test.data, ret) -- cgit v1.2.3-59-g8ed1b