summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2020-12-20 05:36:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-12-20 05:36:26 +0000
commitbad07a2fb99db19a70ff97bae354fefcbfe79233 (patch)
tree474d17bdb0eab748130d644ca4e947e43cbe809f
parent15d46f15d70a87b9d0d677205b01adbb2ad5a2a0 (diff)
parente6a83e65d17234b78025cf849219f40ebe70366e (diff)
Merge "Fix NDK build in downstream branches"
-rw-r--r--apex/apex.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 88d93afa2..9e6625471 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1183,6 +1183,9 @@ func (a *apexBundle) PreventInstall() {
// 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