From a6384821f9dbcd515e34923f2d8cfd175e69aac4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 9 Jun 2020 15:09:22 -0700 Subject: Fix using generated test configs for sh_test, python_test and rust_test modules Annotate the test config properties with android:"path", and always use LOCAL_FULL_TEST_CONFIG to pass the path to Make. Bug: 157621988 Test: manual Change-Id: I1c020e642f83d994d63c9e9cb56e686086d5acaa --- python/androidmk.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'python/androidmk.go') diff --git a/python/androidmk.go b/python/androidmk.go index d293d52a1..247b80dc0 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -66,15 +66,9 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=", strings.Join(p.binaryDecorator.binaryProperties.Test_suites, " ")) } - // If the test config has an explicit config specified use it. - if p.testProperties.Test_config != nil { - fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=", - *p.testProperties.Test_config) - } else { - if p.testConfig != nil { - fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", - p.testConfig.String()) - } + if p.testConfig != nil { + fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", + p.testConfig.String()) } if !BoolDefault(p.binaryProperties.Auto_gen_config, true) { -- cgit v1.2.3-59-g8ed1b