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

Merge "Optionally overwrite package value in test config."

Browse Source
This commit is contained in:
Jaewoong Jung
2019-12-16 17:10:18 +00:00
committed by Gerrit Code Review
parent f56f74be4a e5cd4e10a0
commit 9b1084f9b9
5 changed files with 210 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/app.go
View File

@@ -632,6 +632,17 @@ func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config,
a.testProperties.Test_config_template, a.manifestPath, a.testProperties.Test_suites, a.testProperties.Auto_gen_config)
if a.overridableAppProperties.Package_name != nil {
fixedConfig := android.PathForModuleOut(ctx, "test_config_fixer", "AndroidTest.xml")
rule := android.NewRuleBuilder()
rule.Command().BuiltTool(ctx, "test_config_fixer").
FlagWithArg("--manifest ", a.manifestPath.String()).
FlagWithArg("--package-name ", *a.overridableAppProperties.Package_name).
Input(a.testConfig).
Output(fixedConfig)
rule.Build(pctx, ctx, "fix_test_config", "fix test config")
a.testConfig = fixedConfig
}
a.data = android.PathsForModuleSrc(ctx, a.testProperties.Data)
}