| commit | bad07a2fb99db19a70ff97bae354fefcbfe79233 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sun Dec 20 05:36:26 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Dec 20 05:36:26 2020 +0000 |
| tree | 474d17bdb0eab748130d644ca4e947e43cbe809f | |
| parent | 15d46f15d70a87b9d0d677205b01adbb2ad5a2a0 [diff] | |
| parent | e6a83e65d17234b78025cf849219f40ebe70366e [diff] |
Merge "Fix NDK build in downstream branches"
diff --git a/apex/apex.go b/apex/apex.go index 88d93af..9e66254 100644 --- a/apex/apex.go +++ b/apex/apex.go
@@ -1183,6 +1183,9 @@ // Implements cc.Coverage func (a *apexBundle) HideFromMake() { a.properties.HideFromMake = true + // This HideFromMake is shadowing the ModuleBase one, call through to it for now. + // TODO(ccross): untangle these + a.ModuleBase.HideFromMake() } // Implements cc.Coverage