| commit | 0f6aa7b56fb9edd508d3c84cf1219c5491aa9ba8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 09 16:46:04 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Nov 09 16:46:04 2018 +0000 |
| tree | 9dce9931fcc5bfcdcf0659c1c6f8f502ea70e6c1 | |
| parent | abde584fd1eb9bed4102be623a2b948d98e04ffb [diff] | |
| parent | fa0a37365b1f1536d8d66e996da827f9ceb88211 [diff] |
Merge "Fail gracefully when apek_key is not found"
diff --git a/apex/apex.go b/apex/apex.go index 6819bff..3e7c0a7 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -445,6 +445,11 @@ return false }) + if keyFile == nil { + ctx.PropertyErrorf("key", "private_key for %q could not be found", String(a.properties.Key)) + return + } + cert := String(a.properties.Certificate) if cert != "" && android.SrcIsModule(cert) == "" { defaultDir := ctx.Config().DefaultAppCertificateDir(ctx)