StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent ad435c7dde bad07a2fb9
commit 1f31a3e61b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/apex.go
View File

@@ -1183,6 +1183,9 @@ func (a *apexBundle) PreventInstall() {
// Implements cc.Coverage // Implements cc.Coverage
func (a *apexBundle) HideFromMake() { func (a *apexBundle) HideFromMake() {
a.properties.HideFromMake = true 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 // Implements cc.Coverage