summaryrefslogtreecommitdiff
path: root/java/builder.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-11-12 12:19:42 -0800
committer Colin Cross <ccross@android.com> 2021-11-17 19:55:33 -0800
commitffbcd1d8a086c581a14a42e54fa0019c637f56e6 (patch)
treed4651575c734aa5fd9fd0d9b0bd20ca95ab22d0a /java/builder.go
parent6cfb37af5672c419af04131c48accbea2168f9bd (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 'java/builder.go')
-rw-r--r--java/builder.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/builder.go b/java/builder.go
index ae124a3e7..e64a61f5c 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -120,14 +120,14 @@ var (
"extractMatchingApks",
blueprint.RuleParams{
Command: `rm -rf "$out" && ` +
- `${config.ExtractApksCmd} -o "${out}" -allow-prereleased=${allow-prereleased} ` +
+ `${config.ExtractApksCmd} -o "${out}" -zip "${zip}" -allow-prereleased=${allow-prereleased} ` +
`-sdk-version=${sdk-version} -abis=${abis} ` +
`--screen-densities=${screen-densities} --stem=${stem} ` +
`-apkcerts=${apkcerts} -partition=${partition} ` +
`${in}`,
CommandDeps: []string{"${config.ExtractApksCmd}"},
},
- "abis", "allow-prereleased", "screen-densities", "sdk-version", "stem", "apkcerts", "partition")
+ "abis", "allow-prereleased", "screen-densities", "sdk-version", "stem", "apkcerts", "partition", "zip")
turbine, turbineRE = pctx.RemoteStaticRules("turbine",
blueprint.RuleParams{