diff options
| author | 2020-06-29 19:18:44 -0700 | |
|---|---|---|
| committer | 2020-07-01 10:03:09 -0700 | |
| commit | 11c1e0f94d24d43ab0ac656d10586838e3d81d21 (patch) | |
| tree | 61ab48bd9b80ebb59b822924eb1f636750af3250 /java/builder.go | |
| parent | e6b5e9aa82ccd54cedfb7220f044f5f374fdade2 (diff) | |
Output apkcerts file for android_app_set.
Soong and Make have no ways to figure out what splits will be outputted
from a given android_app_set, so it's impossible for them to provide
full PACKAGES.$(LOCAL_MODULE).CERTIFICATE entries, which are required to
build a final apkcerts.txt. This change makes extract_apks produce
apkcerts.txt files for each input modules instead. The Make-side
counterpart of this change merges all local apkcerts.txt into a final
one.
Fixes: 160119159
Test: main_test.go
Test: m apkcerts-list
Merged-In: I321e80fd636a955213761f56a3ac64bfe7f7f7c0
Change-Id: I321e80fd636a955213761f56a3ac64bfe7f7f7c0
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/builder.go b/java/builder.go index a27e5c390..7318fcbad 100644 --- a/java/builder.go +++ b/java/builder.go @@ -120,10 +120,11 @@ var ( `${config.ExtractApksCmd} -o "${out}" -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") + "abis", "allow-prereleased", "screen-densities", "sdk-version", "stem", "apkcerts", "partition") turbine, turbineRE = remoteexec.StaticRules(pctx, "turbine", blueprint.RuleParams{ |