Enable native bridge support by default for certain ndk modules

The ndk_library, ndk_prebuilt_object and ndk_prebuilt_static_stl
modules are natural targets to have native bridge support enabled,
since they build user facing object which have to be supported for
translated architectures.

Bug: http://b/77159578
Test: make
Change-Id: Ic556f4c1c41e5b3dc92f9c290b4482dee8faed33
This commit is contained in:
dimitry
2019-05-09 14:07:34 +02:00
parent ffff95bc4e
commit 03dc3f63f6
3 changed files with 7 additions and 0 deletions

View File

@@ -70,6 +70,7 @@ func (*ndkPrebuiltObjectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
// ./prebuilts/ndk/current/platforms/android-<sdk_version>/arch-$(HOST_ARCH)/usr/lib/<NAME>.o.
func ndkPrebuiltObjectFactory() android.Module {
module := newBaseModule(android.DeviceSupported, android.MultilibBoth)
module.ModuleBase.EnableNativeBridgeSupportByDefault()
module.linker = &ndkPrebuiltObjectLinker{
objectLinker: objectLinker{
baseLinker: NewBaseLinker(nil),
@@ -134,6 +135,7 @@ func ndkPrebuiltStaticStlFactory() android.Module {
}
module.installer = nil
module.Properties.HideFromMake = true
module.ModuleBase.EnableNativeBridgeSupportByDefault()
return module.Init()
}