diff options
| author | 2019-06-13 04:48:54 +0000 | |
|---|---|---|
| committer | 2019-06-13 05:21:09 +0000 | |
| commit | dd651faac35bd8882576f377d49fd8d6fb27d00b (patch) | |
| tree | 1da86c04b67f171e5e1c478edd99c11a7f29cd23 | |
| parent | d7607c1c99d445d3aae93c25f492ed7a6fc53c07 (diff) | |
Fix a few missing dependencies in APEX building
I found these while trying to build an aosp_arm system image with RBE,
which only makes the sources that you depend on available to every rule.
The hardcoded prebuilts/sdk path is a bit unfortunate, but that's
currently hardcoded as a default in the script as well.
Bug: 130111713
Test: treehugger
Test: build a system image with RBE
Change-Id: I4415563017e053749788b0a537a48d61a2161935
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 41a21c92c..f119778ac 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -61,7 +61,7 @@ var ( `--key ${key} ${opt_flags} ${image_dir} ${out} `, CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}", "${mke2fs}", "${resize2fs}", "${sefcontext_compile}", - "${soong_zip}", "${zipalign}", "${aapt2}"}, + "${soong_zip}", "${zipalign}", "${aapt2}", "prebuilts/sdk/current/public/android.jar"}, Description: "APEX ${image_dir} => ${out}", }, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags") @@ -1062,6 +1062,10 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap Description: "signapk", Output: a.outputFiles[apexType], Input: unsignedOutputFile, + Implicits: []android.Path{ + a.container_certificate_file, + a.container_private_key_file, + }, Args: map[string]string{ "certificates": a.container_certificate_file.String() + " " + a.container_private_key_file.String(), "flags": "-a 4096", //alignment |