Merge "Output apkcerts file for android_app_set." into rvc-dev am: d8f1b81e75

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12041704

Change-Id: I39f867293f232116148b0a0ced65754cf70465a5
This commit is contained in:
Jaewoong Jung
2020-07-01 00:23:47 +00:00
committed by Automerger Merge Worker
6 changed files with 75 additions and 24 deletions

View File

@@ -147,7 +147,7 @@ func TestAndroidAppSet(t *testing.T) {
name: "foo",
set: "prebuilts/apks/app.apks",
prerelease: true,
}`)
}`)
module := ctx.ModuleForTests("foo", "android_common")
const packedSplitApks = "foo.zip"
params := module.Output(packedSplitApks)
@@ -157,6 +157,9 @@ func TestAndroidAppSet(t *testing.T) {
if s := params.Args["allow-prereleased"]; s != "true" {
t.Errorf("wrong allow-prereleased value: '%s', expected 'true'", s)
}
if s := params.Args["partition"]; s != "system" {
t.Errorf("wrong partition value: '%s', expected 'system'", s)
}
mkEntries := android.AndroidMkEntriesForTest(t, config, "", module.Module())[0]
actualMaster := mkEntries.EntryMap["LOCAL_APK_SET_MASTER_FILE"]
expectedMaster := []string{"foo.apk"}