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

Merge "Allow apex module to have android_app_set as its constituent." am: a5c94e1409 am: 342b4810a7

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

Change-Id: If27ef9b94e59620abcf2ef1179f51c2e5ca9b10f
This commit is contained in:
Treehugger Robot
2020-06-05 06:22:41 +00:00
committed by Automerger Merge Worker
parent 5f789d7b91 342b4810a7
commit dba1360d03
6 changed files with 135 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/app_test.go
View File

@@ -149,7 +149,7 @@ func TestAndroidAppSet(t *testing.T) {
prerelease: true,
}`)
module := ctx.ModuleForTests("foo", "android_common")
const packedSplitApks = "extracted.zip"
const packedSplitApks = "foo.zip"
params := module.Output(packedSplitApks)
if params.Rule == nil {
t.Errorf("expected output %s is missing", packedSplitApks)
@@ -218,7 +218,7 @@ func TestAndroidAppSet_Variants(t *testing.T) {
ctx := testContext()
run(t, ctx, config)
module := ctx.ModuleForTests("foo", "android_common")
const packedSplitApks = "extracted.zip"
const packedSplitApks = "foo.zip"
params := module.Output(packedSplitApks)
for k, v := range test.expected {
if actual := params.Args[k]; actual != v {