diff options
| -rw-r--r-- | cc/androidmk.go | 6 | ||||
| -rw-r--r-- | java/androidmk.go | 3 | ||||
| -rw-r--r-- | python/androidmk.go | 4 | ||||
| -rw-r--r-- | rust/androidmk.go | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 988ebd4e3..ff88091d5 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -284,6 +284,9 @@ func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *androi fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", benchmark.testConfig.String()) } fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true") + if !BoolDefault(benchmark.Properties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) androidMkWriteTestData(benchmark.data, ctx, ret) @@ -304,6 +307,9 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa if test.testConfig != nil { fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", test.testConfig.String()) } + if !BoolDefault(test.Properties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) androidMkWriteTestData(test.data, ctx, ret) diff --git a/java/androidmk.go b/java/androidmk.go index 11fea82d6..339e0238c 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -141,6 +141,9 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries { entries.SetPath("LOCAL_FULL_TEST_CONFIG", j.testConfig) } androidMkWriteTestData(j.data, entries) + if !BoolDefault(j.testProperties.Auto_gen_config, true) { + entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true") + } }) return entriesList diff --git a/python/androidmk.go b/python/androidmk.go index aae7cedc9..8e8e8efbf 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -76,6 +76,10 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { p.testConfig.String()) } } + + if !BoolDefault(p.binaryProperties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller) } diff --git a/rust/androidmk.go b/rust/androidmk.go index 2636d97f5..0fba739a2 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -99,6 +99,9 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM if test.testConfig != nil { fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", test.testConfig.String()) } + if !BoolDefault(test.Properties.Auto_gen_config, true) { + fmt.Fprintln(w, "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true") + } }) // TODO(chh): add test data with androidMkWriteTestData(test.data, ctx, ret) } |