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

Only emit enabled VNDK libraries

Browse Source 
Disabled VNDK libraries (due to arch mismatch) are no longer emitted to
make variables VNDK_CORE_LIBRARIES and LLNDK_LIBRARIES

Bug: 7456955
Test: choosecombo to aosp_walleye and m -j
Find libclang_rt.ubsan_standalone-<arch>-android in VNDK_CORE_LIBRARIES.
Only aarch64 and arm are found.

Change-Id: Iaa134d07513e39390fe34a31fdfe2e327b190996
This commit is contained in:
Jiyong Park
2018-02-16 22:14:07 +09:00
parent 3bb5f2f2fa
commit 4b0322265f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/vndk.go
View File

@@ -178,7 +178,7 @@ var (
// gather list of vndk-core, vndk-sp, and ll-ndk libs // gather list of vndk-core, vndk-sp, and ll-ndk libs
func vndkMutator(mctx android.BottomUpMutatorContext) { func vndkMutator(mctx android.BottomUpMutatorContext) {
if m, ok := mctx.Module().(*Module); ok { if m, ok := mctx.Module().(*Module); ok && m.Enabled() {
if lib, ok := m.linker.(*llndkStubDecorator); ok { if lib, ok := m.linker.(*llndkStubDecorator); ok {
vndkLibrariesLock.Lock() vndkLibrariesLock.Lock()
defer vndkLibrariesLock.Unlock() defer vndkLibrariesLock.Unlock()