commit b49ff309a14a6009a2cb6ef2da32f8fc4eb27cb6
author Jayant Chowdhary <jchowdhary@google.com> Wed Feb 21 18:16:02 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 21 18:16:02 2018 +0000
tree e6d7432c7d0fe6b5bd945906edc03f3fa450ffc7
parent d240e3d4e2e90cda77e62ed3fc33d8fa9e8cad4b
parent a4c6df5d69df6722cd6c0d3ca2ab47e0e352d62c

Merge "Start using clang-tools prebuilts for abi diffing tools."

cc/vndk.go

diff --git a/cc/vndk.go b/cc/vndk.go
index d417bea..a0d338b 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -178,7 +178,7 @@
 
 // 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()