diff options
| author | 2020-01-07 06:23:04 +0000 | |
|---|---|---|
| committer | 2020-01-07 06:23:04 +0000 | |
| commit | 13f30ae38ca90714e14da32025d93aedaedec0ad (patch) | |
| tree | 9d385cdf76c6f4fa3249ac8564edd8d1b8f3f442 /java | |
| parent | 64d5ccef7a7cd30a55b7677dcb2987073c315b8e (diff) | |
| parent | 2468d015fefb53337f39414e7ab5a951a57a0885 (diff) | |
Merge "Pass auto_gen_config setting in Android.bp to makefile"
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 7b74293f5..04bf15cf4 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 |