tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix NDK build in downstream branches

Browse source 
The NDK build in downstream branches with prebuilt apexes break
with multiple rules to copy the apex after
I8038ed5c6f05c989ac21ec06c4552fb3136b9a7a renamed SkipInstall to
HideFromMake, which is shadowed by an existing HideFromMake method.
Call through from the existing HideFromMake as a quick-fix for the
build.

Fixes: 175911330
Test: NDK build
Change-Id: Id475671d5dad888913bfb1af2e4be1f2454c3211
This commit is contained in:
Colin Cross 2020-12-17 18:22:34 -08:00
parent ba9e403703
commit e6a83e65d1
1 changed files with 3 additions and 0 deletions
Show stats 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