Merge "Only emit enabled VNDK libraries" am: d240e3d4e2

am: d5f4f45505

Change-Id: I144dffdf5a750f9ef3b4be79616dd8413a1a2eff
This commit is contained in:
Jiyong Park 2018-02-21 02:58:57 +00:00 committed by android-build-merger
commit 9e611039c5

View file

@ -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()