diff options
Diffstat (limited to 'java/app.go')
| -rwxr-xr-x | java/app.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/app.go b/java/app.go index 52348086e..1731970b3 100755 --- a/java/app.go +++ b/java/app.go @@ -984,8 +984,11 @@ type appTestProperties struct { // The name of the android_app module that the tests will run against. Instrumentation_for *string - // if specified, the instrumentation target package name in the manifest is overwritten by it. + // If specified, the instrumentation target package name in the manifest is overwritten by it. Instrumentation_target_package *string + + // If specified, the mainline module package name in the test config is overwritten by it. + Mainline_package_name *string } type AndroidTest struct { @@ -1063,6 +1066,11 @@ func (a *AndroidTest) FixTestConfig(ctx android.ModuleContext, testConfig androi FlagWithArg("--package-name ", *a.overridableAppProperties.Package_name) } + if a.appTestProperties.Mainline_package_name != nil { + fixNeeded = true + command.FlagWithArg("--mainline-package-name ", *a.appTestProperties.Mainline_package_name) + } + if fixNeeded { rule.Build("fix_test_config", "fix test config") return fixedConfig |