Merge "Only emit enabled VNDK libraries"

am: d240e3d4e2

Change-Id: Icdaf1d506a1e8a52972c07f7e953878c664c58c8
This commit is contained in:
Jiyong Park
2018-02-21 02:51:26 +00:00
committed by android-build-merger

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