openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass auto_gen_config setting in Android.bp to makefile 

Bug: none
Test: local test with fuzzy_fastboot
Change-Id: I2c62f6fb58737538ef9e1e9fcbe63e03dfa7ee91
This commit is contained in:
Dan Shi 2020-01-06 15:47:57 -08:00
parent e602918294
commit 2468d015fe
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cc/androidmk.go
View File

@ -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_FULL_TEST_CONFIG :=", benchmark.testConfig.String())
} }
fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true") 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) androidMkWriteTestData(benchmark.data, ctx, ret)
@ -304,6 +307,9 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa
if test.testConfig != nil { if test.testConfig != nil {
fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", test.testConfig.String()) 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) androidMkWriteTestData(test.data, ctx, ret)

3
java/androidmk.go
View File

@ -141,6 +141,9 @@ func (j *Test) AndroidMkEntries() []android.AndroidMkEntries {
entries.SetPath("LOCAL_FULL_TEST_CONFIG", j.testConfig) entries.SetPath("LOCAL_FULL_TEST_CONFIG", j.testConfig)
} }
androidMkWriteTestData(j.data, entries) androidMkWriteTestData(j.data, entries)
if !BoolDefault(j.testProperties.Auto_gen_config, true) {
entries.SetString("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", "true")
}
}) })
return entriesList return entriesList

4
python/androidmk.go
View File

@ -76,6 +76,10 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) {
p.testConfig.String()) 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) base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller)
} }

3
rust/androidmk.go
View File

@ -99,6 +99,9 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM
if test.testConfig != nil { if test.testConfig != nil {
fmt.Fprintln(w, "LOCAL_FULL_TEST_CONFIG :=", test.testConfig.String()) 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) // TODO(chh): add test data with androidMkWriteTestData(test.data, ctx, ret)
} }