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

Commit f97fe739 authored by Matthew Maurer's avatar Matthew Maurer Committed by Automerger Merge Worker
Browse files

Merge "[rust] Add android_dylib cfg flag" am: 83a12d1f am: c65753b3 am:... 

Merge "[rust] Add android_dylib cfg flag" am: 83a12d1f am: c65753b3 am: 5bf21adb am: 238022ab

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1758942

Change-Id: Id94edda2976661929103a858301569e08f02d13d
parents 33c36df5 238022ab

rust/library.go

+6 −0
Original line number Diff line number Diff line
@@ -431,6 +431,12 @@ func (library *libraryDecorator) sharedLibFilename(ctx ModuleContext) string { 


func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags {

	flags.RustFlags = append(flags.RustFlags, "-C metadata="+ctx.ModuleName())

	if library.dylib() {

		// We need to add a dependency on std in order to link crates as dylibs.

		// The hack to add this dependency is guarded by the following cfg so

		// that we don't force a dependency when it isn't needed.

		library.baseCompiler.Properties.Cfgs = append(library.baseCompiler.Properties.Cfgs, "android_dylib")

	}

	flags = library.baseCompiler.compilerFlags(ctx, flags)

	if library.shared() || library.static() {

		library.includeDirs = append(library.includeDirs, android.PathsForModuleSrc(ctx, library.Properties.Include_dirs)...)

rust/library_test.go

+16 −0
Original line number Diff line number Diff line
@@ -85,6 +85,22 @@ func TestDylibPreferDynamic(t *testing.T) { 
	}

}



// Check that we are passing the android_dylib config flag

func TestAndroidDylib(t *testing.T) {

	ctx := testRust(t, `

		rust_library_host_dylib {

			name: "libfoo",

			srcs: ["foo.rs"],

			crate_name: "foo",

		}`)



	libfooDylib := ctx.ModuleForTests("libfoo", "linux_glibc_x86_64_dylib").Output("libfoo.dylib.so")



	if !strings.Contains(libfooDylib.Args["rustcFlags"], "--cfg 'android_dylib'") {

		t.Errorf("missing android_dylib cfg flag for libfoo dylib, rustcFlags: %#v", libfooDylib.Args["rustcFlags"])

	}

}



func TestValidateLibraryStem(t *testing.T) {

	testRustError(t, "crate_name must be defined.", `

			rust_library_host {