Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c9fd4e7 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by Gerrit Code Review
Browse files

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

parents 4af530ff 03dc3f63

android/module.go

+4 −0
Original line number Diff line number Diff line
@@ -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()

}

cc/ndk_library.go

+1 −0
Original line number Diff line number Diff line
@@ -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

}

cc/ndk_prebuilt.go

+2 −0
Original line number Diff line number Diff line
@@ -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()

}