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

Include VNDK snapshot modules only if the arch matches am: 74c3f5c9d1

Browse Source 
am: ce7fe752b4

Change-Id: I3a977e7a48e65a184dcb13ec76ed6c1ec6b77ef4
This commit is contained in:
Justin Yun
2018-01-19 04:26:09 +00:00
committed by android-build-merger
parent 85a98d3fba ce7fe752b4
commit 2e0a23ca40
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/cc.go
View File

@@ -1442,12 +1442,17 @@ func vendorMutator(mctx android.BottomUpMutatorContext) {
mod := mctx.CreateVariations(vendorMode) mod := mctx.CreateVariations(vendorMode)
vendor := mod[0].(*Module) vendor := mod[0].(*Module)
vendor.Properties.UseVndk = true vendor.Properties.UseVndk = true
} else if _, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok { } else if prebuilt, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {
// Make vendor variants only for the versions in BOARD_VNDK_VERSION and // Make vendor variants only for the versions in BOARD_VNDK_VERSION and
// PRODUCT_EXTRA_VNDK_VERSIONS. // PRODUCT_EXTRA_VNDK_VERSIONS.
mod := mctx.CreateVariations(vendorMode) mod := mctx.CreateVariations(vendorMode)
vendor := mod[0].(*Module) vendor := mod[0].(*Module)
vendor.Properties.UseVndk = true 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() { } else if m.hasVendorVariant() {
// This will be available in both /system and /vendor // This will be available in both /system and /vendor
// or a /system directory that is available to vendor. // or a /system directory that is available to vendor.