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

Commit 52767be3 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

Add support for Rust C libraries. 

Adds the ability for rust modules to be compiled as C libraries, and
allows cc modules to depend on these rust-generated modules. This also
means that soong-rust should not have any dependencies on soong-cc aside
from what's required for testing.

There's a couple small fixes included as well:

 - A bug in libNameFromFilePath that caused issues when library's had
 "lib" in their name.
 - VariantName is removed from rust library MutatedProperties since this
 was unused.

Bug: 140726209
Test: Soong tests pass.
Test: Example cc_binary can include a rust shared library as a dep.
Test: m crosvm.experimental
Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
parent 183a3218

cc/androidmk.go

+5 −5
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ type AndroidMkContext interface { 
	Arch() android.Arch

	Os() android.OsType

	Host() bool

	useVndk() bool

	UseVndk() bool

	vndkVersion() string

	static() bool

	inRecovery() bool

	InRecovery() bool

}



type subAndroidMkProvider interface {
@@ -89,9 +89,9 @@ func (c *Module) AndroidMk() android.AndroidMkData { 
					fmt.Fprintln(w, "LOCAL_WHOLE_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkWholeStaticLibs, " "))

				}

				fmt.Fprintln(w, "LOCAL_SOONG_LINK_TYPE :=", c.makeLinkType)

				if c.useVndk() {

				if c.UseVndk() {

					fmt.Fprintln(w, "LOCAL_USE_VNDK := true")

					if c.isVndk() && !c.static() {

					if c.IsVndk() && !c.static() {

						fmt.Fprintln(w, "LOCAL_SOONG_VNDK_VERSION := "+c.vndkVersion())

					}

				}
@@ -224,7 +224,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An 
		})

	}

	if len(library.Properties.Stubs.Versions) > 0 &&

		android.DirectlyInAnyApex(ctx, ctx.Name()) && !ctx.inRecovery() && !ctx.useVndk() &&

		android.DirectlyInAnyApex(ctx, ctx.Name()) && !ctx.InRecovery() && !ctx.UseVndk() &&

		!ctx.static() {

		if !library.buildStubs() {

			ret.SubName = ".bootstrap"

cc/cc.go

+216 −114

File changed.

Preview size limit exceeded, changes collapsed.

cc/cc_test.go

+3 −3
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string 
	t.Helper()



	mod := ctx.ModuleForTests(name, vendorVariant).Module().(*Module)

	if !mod.hasVendorVariant() {

	if !mod.HasVendorVariant() {

		t.Errorf("%q must have vendor variant", name)

	}
@@ -230,8 +230,8 @@ func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string 
	if mod.vndkdep == nil {

		t.Fatalf("%q must have `vndkdep`", name)

	}

	if !mod.isVndk() {

		t.Errorf("%q isVndk() must equal to true", name)

	if !mod.IsVndk() {

		t.Errorf("%q IsVndk() must equal to true", name)

	}

	if mod.isVndkSp() != isVndkSp {

		t.Errorf("%q isVndkSp() must equal to %t", name, isVndkSp)

cc/fuzz.go

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { 


		// Discard vendor-NDK-linked modules, they're duplicates of fuzz targets

		// we're going to package anyway.

		if ccModule.useVndk() || !ccModule.Enabled() {

		if ccModule.UseVndk() || !ccModule.Enabled() {

			return

		}

cc/library.go

+51 −43

File changed.

Preview size limit exceeded, changes collapsed.