From ffbcd1d8a086c581a14a42e54fa0019c637f56e6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 12 Nov 2021 12:19:42 -0800 Subject: 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 --- java/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/builder.go') 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{ -- cgit v1.2.3-59-g8ed1b