StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable native bridge support by default for certain ndk modules"

Browse Source
This commit is contained in:
Dimitry Ivanov
2019-05-10 08:16:49 +00:00
committed by Gerrit Code Review
parent 4af530ff72 03dc3f63f6
commit 9c9fd4e73a
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/module.go
View File

@@ -1299,6 +1299,10 @@ func (a *ModuleBase) MakeAsPlatform() {
a.commonProperties.Product_services_specific = boolPtr(false) a.commonProperties.Product_services_specific = boolPtr(false)
} }
func (a *ModuleBase) EnableNativeBridgeSupportByDefault() {
a.commonProperties.Native_bridge_supported = boolPtr(true)
}
func (a *androidModuleContext) InstallInData() bool { func (a *androidModuleContext) InstallInData() bool {
return a.module.InstallInData() return a.module.InstallInData()
} }

1
cc/ndk_library.go
View File

@@ -382,5 +382,6 @@ func newStubLibrary() *Module {
func ndkLibraryFactory() android.Module { func ndkLibraryFactory() android.Module {
module := newStubLibrary() module := newStubLibrary()
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth) android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth)
module.ModuleBase.EnableNativeBridgeSupportByDefault()
return module return module
} }

2
cc/ndk_prebuilt.go
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. // ./prebuilts/ndk/current/platforms/android-<sdk_version>/arch-$(HOST_ARCH)/usr/lib/<NAME>.o.
func ndkPrebuiltObjectFactory() android.Module { func ndkPrebuiltObjectFactory() android.Module {
module := newBaseModule(android.DeviceSupported, android.MultilibBoth) module := newBaseModule(android.DeviceSupported, android.MultilibBoth)
module.ModuleBase.EnableNativeBridgeSupportByDefault()
module.linker = &ndkPrebuiltObjectLinker{ module.linker = &ndkPrebuiltObjectLinker{
objectLinker: objectLinker{ objectLinker: objectLinker{
baseLinker: NewBaseLinker(nil), baseLinker: NewBaseLinker(nil),
@@ -134,6 +135,7 @@ func ndkPrebuiltStaticStlFactory() android.Module {
} }
module.installer = nil module.installer = nil
module.Properties.HideFromMake = true module.Properties.HideFromMake = true
module.ModuleBase.EnableNativeBridgeSupportByDefault()
return module.Init() return module.Init()
} }