Merge "Skip native_bridge modules when installing vndk snapshot" am: 656833e0c8 am: 441c715fe8

am: 4fb0004f6b

Change-Id: I2660161e99e42e326650b9f4558ff43807f69b0e
This commit is contained in:
Dimitry Ivanov
2019-05-31 06:17:28 -07:00
committed by android-build-merger

View File

@@ -467,6 +467,10 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex
return
}
if m.Target().NativeBridge == android.NativeBridgeEnabled {
return
}
lib, is_lib := m.linker.(*libraryDecorator)
prebuilt_lib, is_prebuilt_lib := m.linker.(*prebuiltLibraryLinker)