openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip native_bridge modules when listing VNDK libs 

native_bridge modules cannot be VNDK modules at the same time.

Bug: 137709824
Test: build cf_x86_64_phone
      check if llndk.libraries.*.txt has libclang_rt.asan for arm

Change-Id: I974e89b9da522e26531a576015e98dc54834282d
This commit is contained in:
Justin Yun 2019-09-08 11:34:06 +09:00
parent 2b9e20ef82
commit 7390ea3d79
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cc/vndk.go
View File

@ -317,10 +317,13 @@ func VndkMutator(mctx android.BottomUpMutatorContext) {
if !ok { if !ok {
return return
} }
if !m.Enabled() { if !m.Enabled() {
return return
} }
if m.Target().NativeBridge == android.NativeBridgeEnabled {
// Skip native_bridge modules
return
}
if m.isVndk() { if m.isVndk() {
if lib, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok { if lib, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {