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

Merge "Fix vendor variants generation of vndk" am: f68f98eeb6

Browse Source 
am: 3af01a3fc9

Change-Id: I5bc733a882b2a4ddfc89f26a56b22acce8ec249f
This commit is contained in:
Inseob Kim
2019-11-03 18:16:43 -08:00
committed by android-build-merger
parent d5dcbd7d81 3af01a3fc9
commit ad18218113
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) == "" {