diff --git a/android/module.go b/android/module.go index fb5c00acb..3906fd7de 100644 --- a/android/module.go +++ b/android/module.go @@ -1299,6 +1299,10 @@ func (a *ModuleBase) MakeAsPlatform() { a.commonProperties.Product_services_specific = boolPtr(false) } +func (a *ModuleBase) EnableNativeBridgeSupportByDefault() { + a.commonProperties.Native_bridge_supported = boolPtr(true) +} + func (a *androidModuleContext) InstallInData() bool { return a.module.InstallInData() } diff --git a/cc/ndk_library.go b/cc/ndk_library.go index c63b200a2..57fad7caa 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -382,5 +382,6 @@ func newStubLibrary() *Module { func ndkLibraryFactory() android.Module { module := newStubLibrary() android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth) + module.ModuleBase.EnableNativeBridgeSupportByDefault() return module } diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index 8451295e5..026ff220a 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -70,6 +70,7 @@ func (*ndkPrebuiltObjectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps { // ./prebuilts/ndk/current/platforms/android-/arch-$(HOST_ARCH)/usr/lib/.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() }