summaryrefslogtreecommitdiff
path: root/android/module.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-06-13 03:36:08 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-06-13 03:36:08 +0000
commite51e2feafdf7dbb84d41850237dd4858b98d93f2 (patch)
treefca1cc7df3572afabd7aefa94d98d3b53e1b2850 /android/module.go
parent72ea641dffd8b6d037d1529ea6946c726a624f14 (diff)
parent3245b2cb83342fa162822832d0d9adde2f0c5bed (diff)
Merge changes I89ad92f3,Ife1604c0
* changes: Don't add dependencies on uses-library modules in unbundled builds Add implicit outputs to ErrorRule rules
Diffstat (limited to 'android/module.go')
-rw-r--r--android/module.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/android/module.go b/android/module.go
index 03993e519..87e2ca7d9 100644
--- a/android/module.go
+++ b/android/module.go
@@ -966,10 +966,12 @@ type moduleContext struct {
func (m *moduleContext) ninjaError(params BuildParams, err error) (PackageContext, BuildParams) {
return pctx, BuildParams{
- Rule: ErrorRule,
- Description: params.Description,
- Output: params.Output,
- Outputs: params.Outputs,
+ Rule: ErrorRule,
+ Description: params.Description,
+ Output: params.Output,
+ Outputs: params.Outputs,
+ ImplicitOutput: params.ImplicitOutput,
+ ImplicitOutputs: params.ImplicitOutputs,
Args: map[string]string{
"error": err.Error(),
},