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

Skip installing the VNDK prebuilt if arch does not match am: 312ccb974f

Browse source 
am: 04e36e89df

Change-Id: Ib5679d3295a8ee74bc2af17f26c1e0b20aab35ce
This commit is contained in:
Justin Yun 2018-01-23 23:07:09 +00:00 committed by android-build-merger
commit 27fa6a5ca8
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cc/cc.go
View file

@ -1510,17 +1510,12 @@ func vendorMutator(mctx android.BottomUpMutatorContext) {
mod := mctx.CreateVariations(vendorMode)
vendor := mod[0].(*Module)
vendor.Properties.UseVndk = true
} else if prebuilt, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {
} else if _, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {
// Make vendor variants only for the versions in BOARD_VNDK_VERSION and
// PRODUCT_EXTRA_VNDK_VERSIONS.
mod := mctx.CreateVariations(vendorMode)
vendor := mod[0].(*Module)
vendor.Properties.UseVndk = true
arches := mctx.DeviceConfig().Arches()
if len(arches) == 0 || arches[0].ArchType.String() != prebuilt.arch() {
vendor.Properties.PreventInstall = true
vendor.Properties.HideFromMake = true
}
} else if m.hasVendorVariant() && !vendorSpecific {
// This will be available in both /system and /vendor
// or a /system directory that is available to vendor.

4
cc/vndk_prebuilt.go
View file

@ -110,6 +110,10 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,
}
func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) {
arches := ctx.DeviceConfig().Arches()
if len(arches) == 0 || arches[0].ArchType.String() != p.arch() {
return
}
if p.shared() {
if ctx.isVndkSp() {
p.baseInstaller.subDir = "vndk-sp-" + p.version()