From 4b0322265fe66222a048e5ef5ec8f1738b0112da Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Fri, 16 Feb 2018 22:14:07 +0900
Subject: [PATCH] Only emit enabled VNDK libraries

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
---
 cc/vndk.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cc/vndk.go b/cc/vndk.go
index d417bea6d..a0d338bc2 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -178,7 +178,7 @@ var (
 
 // gather list of vndk-core, vndk-sp, and ll-ndk libs
 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 {
 			vndkLibrariesLock.Lock()
 			defer vndkLibrariesLock.Unlock()