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

add the LOCAL_DISABLE_TEST_CONFIG variable 

Introduce and set the variable LOCAL_DISABLE_TEST_CONFIG varaible to be
true for the `android_test_helper_app` type modules.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I5db1029f31d8afe1ca5e9fab95e39d751971058d
Merged-In: I5db1029f31d8afe1ca5e9fab95e39d751971058d
This commit is contained in:
Yuntao Xu 2021-05-27 10:30:26 -07:00
parent 799822d7af
commit ad1668fc13
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/androidmk.go
View File

@ -460,6 +460,8 @@ func (a *AndroidTestHelperApp) AndroidMkEntries() []android.AndroidMkEntries {
entries := &entriesList[0]
entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
testSuiteComponent(entries, a.appTestHelperAppProperties.Test_suites)
// introduce a flag variable to control the generation of the .config file
entries.SetString("LOCAL_DISABLE_TEST_CONFIG", "true")
})
return entriesList

18
java/androidmk_test.go
View File

@ -188,3 +188,21 @@ func TestImportSoongDexJar(t *testing.T) {
android.AssertStringPathsRelativeToTopEquals(t, "LOCAL_SOONG_DEX_JAR", result.Config, []string{expectedSoongDexJar}, actualSoongDexJar)
}
func TestAndroidTestHelperApp_LocalDisableTestConfig(t *testing.T) {
ctx, _ := testJava(t, `
android_test_helper_app {
name: "foo",
srcs: ["a.java"],
}
`)
mod := ctx.ModuleForTests("foo", "android_common").Module()
entries := android.AndroidMkEntriesForTest(t, ctx, mod)[0]
expected := []string{"true"}
actual := entries.EntryMap["LOCAL_DISABLE_TEST_CONFIG"]
if !reflect.DeepEqual(expected, actual) {
t.Errorf("Unexpected flag value - expected: %q, actual: %q", expected, actual)
}
}