| commit | d240e3d4e2e90cda77e62ed3fc33d8fa9e8cad4b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 21 02:35:31 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 21 02:35:31 2018 +0000 |
| tree | cfe29ae3dc4379af5ec0ff6b8f707bf8aa6ecb2f | |
| parent | 52226ad920fc848927070561a96a931157764d5b [diff] | |
| parent | 4b0322265fe66222a048e5ef5ec8f1738b0112da [diff] |
Merge "Only emit enabled VNDK libraries"
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()