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

Commit 53a452d1 authored Jul 26, 2022 by Matthew Maurer

rust: Only allow bindgen to produce `rlib`s.

Generated bindings are intended to be slim translation layers, usually
consisting of nothing more than type signatures and constants.
Generally, they should also be used in exactly one location by the safe
wrapper for these bindings. By preventing them from building as
`dylib`s, we avoid the per-library overhead of these non-reused pieces
of code.

Additionally, default visibility restrict all bindgen modules to their
subpackages. This is being done both:
* to encourage use of a single safe bindings crate
* to avoid diamond dependency graphs with mixed rlib/dylib dependencies

Bug: 166332519
Test: m; Make sample module use dylib bindgen dependency, see build failure.
Change-Id: I8e9d9cb851c2ec99f4ed63e6e18c4ba26b29721c

parent 0bb7f049

rust/bindgen.go

+9 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,15 @@ func NewRustBindgen(hod android.HostOrDeviceSupported) (Module, bindgenDecorat
		ClangProperties: cc.RustBindgenClangProperties{},
		}

		module := NewSourceProviderModule(hod, bindgen, false)
		module := NewSourceProviderModule(hod, bindgen, false, true)

		android.AddLoadHook(module, func(ctx android.LoadHookContext) {
		type stub_props struct {
		Visibility []string
		}
		props := &stub_props{[]string{":__subpackages__"}}
		ctx.PrependProperties(props)
		})

		return module, bindgen
		}

rust/protobuf.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ func NewRustProtobuf(hod android.HostOrDeviceSupported) (Module, protobufDecor
		Properties: ProtobufProperties{},
		}

		module := NewSourceProviderModule(hod, protobuf, false)
		module := NewSourceProviderModule(hod, protobuf, false, false)

		return module, protobuf
		}

rust/source_provider.go

+4 −1

Original line number	Diff line number	Diff line
		@@ -65,9 +65,12 @@ func NewSourceProvider() *BaseSourceProvider {
		}
		}

		func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool) *Module {
		func NewSourceProviderModule(hod android.HostOrDeviceSupported, sourceProvider SourceProvider, enableLints bool, rlibOnly bool) *Module {
		_, library := NewRustLibrary(hod)
		library.BuildOnlyRust()
		if rlibOnly {
		library.BuildOnlyRlib()
		}
		library.sourceProvider = sourceProvider

		module := newModule(hod, android.MultilibBoth)