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

Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe am: f7e9e1f434

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

Change-Id: I5e05dbd3bca3c14bb52ad383c8af3eaf491222a1
This commit is contained in:
Treehugger Robot
2022-01-11 08:11:46 +00:00
committed by Automerger Merge Worker
parent 2715e898c5 f7e9e1f434
commit d887d9b452
5 changed files with 115 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
java/app_test.go
View File

@@ -1709,7 +1709,7 @@ func TestPackageNameOverride(t *testing.T) {
},
},
{
name: "overridden",
name: "overridden via PRODUCT_PACKAGE_NAME_OVERRIDES",
bp: `
android_app {
name: "foo",
@@ -1724,6 +1724,22 @@ func TestPackageNameOverride(t *testing.T) {
"out/soong/target/product/test_device/system/app/bar/bar.apk",
},
},
{
name: "overridden via stem",
bp: `
android_app {
name: "foo",
srcs: ["a.java"],
sdk_version: "current",
stem: "bar",
}
`,
packageNameOverride: "",
expected: []string{
"out/soong/.intermediates/foo/android_common/bar.apk",
"out/soong/target/product/test_device/system/app/bar/bar.apk",
},
},
}
for _, test := range testCases {
@@ -1968,6 +1984,80 @@ func TestOverrideAndroidApp(t *testing.T) {
}
}
func TestOverrideAndroidAppStem(t *testing.T) {
ctx, _ := testJava(t, `
android_app {
name: "foo",
srcs: ["a.java"],
sdk_version: "current",
}
override_android_app {
name: "bar",
base: "foo",
}
override_android_app {
name: "baz",
base: "foo",
stem: "baz_stem",
}
android_app {
name: "foo2",
srcs: ["a.java"],
sdk_version: "current",
stem: "foo2_stem",
}
override_android_app {
name: "bar2",
base: "foo2",
}
override_android_app {
name: "baz2",
base: "foo2",
stem: "baz2_stem",
}
`)
for _, expected := range []struct {
moduleName string
variantName string
apkPath string
}{
{
moduleName: "foo",
variantName: "android_common",
apkPath: "out/soong/target/product/test_device/system/app/foo/foo.apk",
},
{
moduleName: "foo",
variantName: "android_common_bar",
apkPath: "out/soong/target/product/test_device/system/app/bar/bar.apk",
},
{
moduleName: "foo",
variantName: "android_common_baz",
apkPath: "out/soong/target/product/test_device/system/app/baz_stem/baz_stem.apk",
},
{
moduleName: "foo2",
variantName: "android_common",
apkPath: "out/soong/target/product/test_device/system/app/foo2_stem/foo2_stem.apk",
},
{
moduleName: "foo2",
variantName: "android_common_bar2",
// Note that this may cause the duplicate output error.
apkPath: "out/soong/target/product/test_device/system/app/foo2_stem/foo2_stem.apk",
},
{
moduleName: "foo2",
variantName: "android_common_baz2",
apkPath: "out/soong/target/product/test_device/system/app/baz2_stem/baz2_stem.apk",
},
} {
variant := ctx.ModuleForTests(expected.moduleName, expected.variantName)
variant.Output(expected.apkPath)
}
}
func TestOverrideAndroidAppDependency(t *testing.T) {
ctx, _ := testJava(t, `
android_app {