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

Skip creating vendor variants for native_bridge modules

Browse Source 
am: 1282f42ed6

Change-Id: Ia64f3b40220bebf429cf9032e4700d64a11576a7
This commit is contained in:
Justin Yun
2019-09-09 04:23:01 -07:00
committed by android-build-merger
parent 8bc65478d6 1282f42ed6
commit b4ce961486
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -2323,6 +2323,9 @@ func ImageMutator(mctx android.BottomUpMutatorContext) {
// If the device isn't compiling against the VNDK, we always // If the device isn't compiling against the VNDK, we always
// use the core mode. // use the core mode.
coreVariantNeeded = true coreVariantNeeded = true
} else if m.Target().NativeBridge == android.NativeBridgeEnabled {
// Skip creating vendor variants for natvie bridge modules
coreVariantNeeded = true
} else if _, ok := m.linker.(*llndkStubDecorator); ok { } else if _, ok := m.linker.(*llndkStubDecorator); ok {
// LL-NDK stubs only exist in the vendor variant, since the // LL-NDK stubs only exist in the vendor variant, since the
// real libraries will be used in the core variant. // real libraries will be used in the core variant.