diff options
| author | 2020-05-27 16:36:07 -0700 | |
|---|---|---|
| committer | 2020-06-05 15:39:38 -0700 | |
| commit | c4f0ff1d6cd68d20e4716119a7d6fbbacd428fe6 (patch) | |
| tree | 237eb3b941b8464243978aac04562a320073111b /java/app_test.go | |
| parent | d7fdfd6e772a4bf79966ca0ebc4bd2fee4b63cc6 (diff) | |
Cherrypick aosp/1318079 and aosp/1324841
Allow apex module to have android_app_set as its constituent.
Fix android_app_set documentation
Fixes: 157166068
Test: treehugger & manual
Change-Id: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: I9f91f1b761286f489d175eb0772f78f702e8a2d6
Merged-In: Id9b296d9301902deb463b299413491bc66d58944
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/app_test.go b/java/app_test.go index e686f2780..956cbab86 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -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 { |