Merge "Fix NDK build in downstream branches" am: bad07a2fb9

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1532267

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae017ed00ef5436926d1fffd09dbfb0d8ba5eb7
This commit is contained in:
Colin Cross 2020-12-20 06:05:21 +00:00 committed by Automerger Merge Worker
commit 1f31a3e61b

View file

@ -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