StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "mk2bp LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG" am: 022844744d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1975346

Change-Id: I4b8727da5c011c5b53723f456ead8f37d0745f01
This commit is contained in:
Yuntao Xu
2022-02-11 23:20:04 +00:00
committed by Automerger Merge Worker
parent 64a2fef4c9 022844744d
commit b6dbfd8b4e
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/androidmk/android.go
View File

@@ -68,6 +68,8 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){
"LOCAL_MODULE_PATH": prebuiltModulePath,
"LOCAL_REPLACE_PREBUILT_APK_INSTALLED": prebuiltPreprocessed,
"LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG": invert("auto_gen_config"),
// composite functions
"LOCAL_MODULE_TAGS": includeVariableIf(bpVariable{"tags", bpparser.ListType}, not(valueDumpEquals("optional"))),

30
androidmk/androidmk/androidmk_test.go
View File

@@ -1643,6 +1643,36 @@ android_app {
"gen_src3",
],
}
`,
},
{
desc: "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG is true",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := true
include $(BUILD_PACKAGE)
`,
expected: `
android_app {
name: "foo",
auto_gen_config: false,
}
`,
},
{
desc: "LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG is false",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG := false
include $(BUILD_PACKAGE)
`,
expected: `
android_app {
name: "foo",
auto_gen_config: true,
}
`,
},
}