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

Merge "Fix vendor variants generation of vndk"

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-04 02:00:41 +00:00
committed by Gerrit Code Review
parent bb7c5d4f69 bc093672ed
commit f68f98eeb6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/cc.go
View File

@@ -2653,7 +2653,11 @@ func ImageMutator(mctx android.BottomUpMutatorContext) {
// or a /system directory that is available to vendor. // or a /system directory that is available to vendor.
coreVariantNeeded = true coreVariantNeeded = true
vendorVariants = append(vendorVariants, platformVndkVersion) vendorVariants = append(vendorVariants, platformVndkVersion)
if m.IsVndk() { // VNDK modules must not create BOARD_VNDK_VERSION variant because its
// code is PLATFORM_VNDK_VERSION.
// On the other hand, vendor_available modules which are not VNDK should
// also build BOARD_VNDK_VERSION because it's installed in /vendor.
if !m.IsVndk() {
vendorVariants = append(vendorVariants, deviceVndkVersion) vendorVariants = append(vendorVariants, deviceVndkVersion)
} }
} else if vendorSpecific && String(m.Properties.Sdk_version) == "" { } else if vendorSpecific && String(m.Properties.Sdk_version) == "" {