diff options
| author | 2021-11-12 12:19:42 -0800 | |
|---|---|---|
| committer | 2021-11-17 19:55:33 -0800 | |
| commit | ffbcd1d8a086c581a14a42e54fa0019c637f56e6 (patch) | |
| tree | d4651575c734aa5fd9fd0d9b0bd20ca95ab22d0a /apex/builder.go | |
| parent | 6cfb37af5672c419af04131c48accbea2168f9bd (diff) | |
Extract primary apk from apk set zip
Extract and install the primary apk normally, and then unzip the rest
of them as a post install command.
Bug: 204136549
Test: app_set_test.go
Change-Id: I17437ff27f49df6bc91bdbbea6173b46c7d3ec4e
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go index 2e21ddfa1..3599c5d01 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -442,7 +442,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { } else { if fi.class == appSet { copyCommands = append(copyCommands, - fmt.Sprintf("unzip -qDD -d %s %s", destPathDir, fi.builtFile.String())) + fmt.Sprintf("unzip -qDD -d %s %s", destPathDir, + fi.module.(*java.AndroidAppSet).PackedAdditionalOutputs().String())) } else { copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath) } |