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

Merge "Always create both variants for kernel headers"

Browse Source
This commit is contained in:
Inseob Kim
2020-06-16 23:38:02 +00:00
committed by Gerrit Code Review
parent 9a0b897904 f3044b64d7
commit bee157256d
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/cc.go
View File

@@ -3099,10 +3099,19 @@ func (m *Module) ImageMutatorBegin(mctx android.BaseModuleContext) {
} }
} else if vendorSpecific && String(m.Properties.Sdk_version) == "" { } else if vendorSpecific && String(m.Properties.Sdk_version) == "" {
// This will be available in /vendor (or /odm) only // This will be available in /vendor (or /odm) only
// We assume that modules under proprietary paths are compatible for
// BOARD_VNDK_VERSION. The other modules are regarded as AOSP, or // kernel_headers is a special module type whose exported headers
// PLATFORM_VNDK_VERSION. // are coming from DeviceKernelHeaders() which is always vendor
if isVendorProprietaryPath(mctx.ModuleDir()) { // dependent. They'll always have both vendor variants.
// For other modules, we assume that modules under proprietary
// paths are compatible for BOARD_VNDK_VERSION. The other modules
// are regarded as AOSP, which is PLATFORM_VNDK_VERSION.
if _, ok := m.linker.(*kernelHeadersDecorator); ok {
vendorVariants = append(vendorVariants,
platformVndkVersion,
boardVndkVersion,
)
} else if isVendorProprietaryPath(mctx.ModuleDir()) {
vendorVariants = append(vendorVariants, boardVndkVersion) vendorVariants = append(vendorVariants, boardVndkVersion)
} else { } else {
vendorVariants = append(vendorVariants, platformVndkVersion) vendorVariants = append(vendorVariants, platformVndkVersion)