tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix test app and helper installation dirs."

Browse source 
am: a21e9ddcf8

Change-Id: I9c318eb6cd6e67e9ef6788e7dce18bb4406bcf64
This commit is contained in:
Jaewoong Jung 2019-11-21 15:26:24 -08:00 committed by android-build-merger
commit 41afdba365
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/app.go
View file

@ -448,7 +448,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
} else if a.Privileged() { } else if a.Privileged() {
a.installDir = android.PathForModuleInstall(ctx, "priv-app", a.installApkName) a.installDir = android.PathForModuleInstall(ctx, "priv-app", a.installApkName)
} else if ctx.InstallInTestcases() { } else if ctx.InstallInTestcases() {
a.installDir = android.PathForModuleInstall(ctx, a.installApkName) a.installDir = android.PathForModuleInstall(ctx, a.installApkName, ctx.DeviceConfig().DeviceArch())
} else { } else {
a.installDir = android.PathForModuleInstall(ctx, "app", a.installApkName) a.installDir = android.PathForModuleInstall(ctx, "app", a.installApkName)
} }
@ -697,6 +697,10 @@ type AndroidTestHelperApp struct {
appTestHelperAppProperties appTestHelperAppProperties appTestHelperAppProperties appTestHelperAppProperties
} }
func (a *AndroidTestHelperApp) InstallInTestcases() bool {
return true
}
// android_test_helper_app compiles sources and Android resources into an Android application package `.apk` file that // android_test_helper_app compiles sources and Android resources into an Android application package `.apk` file that
// will be used by tests, but does not produce an `AndroidTest.xml` file so the module will not be run directly as a // will be used by tests, but does not produce an `AndroidTest.xml` file so the module will not be run directly as a
// test. // test.

4
java/app_test.go
View file

@ -1159,7 +1159,7 @@ func TestOverrideAndroidTest(t *testing.T) {
}{ }{
{ {
variantName: "android_common", variantName: "android_common",
apkPath: "/target/product/test_device/testcases/foo_test/foo_test.apk", apkPath: "/target/product/test_device/testcases/foo_test/arm64/foo_test.apk",
overrides: nil, overrides: nil,
targetVariant: "android_common", targetVariant: "android_common",
packageFlag: "", packageFlag: "",
@ -1167,7 +1167,7 @@ func TestOverrideAndroidTest(t *testing.T) {
}, },
{ {
variantName: "android_common_bar_test", variantName: "android_common_bar_test",
apkPath: "/target/product/test_device/testcases/bar_test/bar_test.apk", apkPath: "/target/product/test_device/testcases/bar_test/arm64/bar_test.apk",
overrides: []string{"foo_test"}, overrides: []string{"foo_test"},
targetVariant: "android_common_bar", targetVariant: "android_common_bar",
packageFlag: "com.android.bar.test", packageFlag: "com.android.bar.test",