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

Commit 367c01b1 authored by Matthew Maurer's avatar Matthew Maurer Committed by Gerrit Code Review
Browse files

Merge changes from topic "rust-flex" 

* changes:
  rust: Suppress default sysroot unconditionally
  rust: Mutate prebuilt modules dylib/rlib
  rust: Add rustlibs auto dependency selection
  rust: Change default variants
  rust: Fix Properties inheritance for prebuilts
parents 2e1b8bae bb3add11

rust/binary.go

+8 −0
Original line number Diff line number Diff line
@@ -131,3 +131,11 @@ func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps Path 
func (binary *binaryDecorator) coverageOutputZipPath() android.OptionalPath {

	return binary.coverageOutputZipFile

}



func (binary *binaryDecorator) autoDep() autoDep {

	if binary.preferDynamic() {

		return dylibAutoDep

	} else {

		return rlibAutoDep

	}

}

rust/builder.go

+18 −24
Original line number Diff line number Diff line
@@ -70,37 +70,37 @@ func init() { 
}



func TransformSrcToBinary(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, includeDirs []string) buildOutput {

	outputFile android.WritablePath, linkDirs []string) buildOutput {

	flags.RustFlags = append(flags.RustFlags, "-C lto")



	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "bin", includeDirs)

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "bin", linkDirs)

}



func TransformSrctoRlib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, includeDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "rlib", includeDirs)

	outputFile android.WritablePath, linkDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "rlib", linkDirs)

}



func TransformSrctoDylib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, includeDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "dylib", includeDirs)

	outputFile android.WritablePath, linkDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "dylib", linkDirs)

}



func TransformSrctoStatic(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, includeDirs []string) buildOutput {

	outputFile android.WritablePath, linkDirs []string) buildOutput {

	flags.RustFlags = append(flags.RustFlags, "-C lto")

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "staticlib", includeDirs)

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "staticlib", linkDirs)

}



func TransformSrctoShared(ctx ModuleContext, mainSrc android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, includeDirs []string) buildOutput {

	outputFile android.WritablePath, linkDirs []string) buildOutput {

	flags.RustFlags = append(flags.RustFlags, "-C lto")

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "cdylib", includeDirs)

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "cdylib", linkDirs)

}



func TransformSrctoProcMacro(ctx ModuleContext, mainSrc android.Path, deps PathDeps,

	flags Flags, outputFile android.WritablePath, includeDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "proc-macro", includeDirs)

	flags Flags, outputFile android.WritablePath, linkDirs []string) buildOutput {

	return transformSrctoCrate(ctx, mainSrc, deps, flags, outputFile, "proc-macro", linkDirs)

}



func rustLibsToPaths(libs RustLibraries) android.Paths {
@@ -112,7 +112,7 @@ func rustLibsToPaths(libs RustLibraries) android.Paths { 
}



func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, flags Flags,

	outputFile android.WritablePath, crate_type string, includeDirs []string) buildOutput {

	outputFile android.WritablePath, crate_type string, linkDirs []string) buildOutput {



	var inputs android.Paths

	var implicits android.Paths
@@ -137,16 +137,10 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		rustcFlags = append(rustcFlags, "--target="+targetTriple)

		linkFlags = append(linkFlags, "-target "+targetTriple)

	}

	// TODO(b/159718669): Once we have defined static libraries in the host

	// prebuilts Blueprint file, sysroot should be unconditionally sourced

	// from /dev/null. Explicitly set sysroot to avoid clippy-driver to

	// internally call rustc.

	if ctx.Host() && ctx.TargetPrimary() {

		rustcFlags = append(rustcFlags, "--sysroot=${config.RustPath}")

	} else {

		// If we're not targeting the host primary arch, do not use a sysroot.



	// Suppress an implicit sysroot

	rustcFlags = append(rustcFlags, "--sysroot=/dev/null")

	}



	// Collect linker flags

	linkFlags = append(linkFlags, flags.GlobalLinkFlags...)

	linkFlags = append(linkFlags, flags.LinkFlags...)
@@ -162,7 +156,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		libFlags = append(libFlags, "--extern "+proc_macro.CrateName+"="+proc_macro.Path.String())

	}



	for _, path := range includeDirs {

	for _, path := range linkDirs {

		libFlags = append(libFlags, "-L "+path)

	}

rust/clippy_test.go

+4 −4
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ func TestClippy(t *testing.T) { 
			clippy: false,

		}`)



	ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_shared").Output("libfoo.so")

	fooClippy := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_shared").MaybeRule("clippy")

	ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").Output("libfoo.dylib.so")

	fooClippy := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_dylib").MaybeRule("clippy")

	if fooClippy.Rule.String() != "android/soong/rust.clippy" {

		t.Errorf("Clippy output (default) for libfoo was not generated: %+v", fooClippy)

	}



	ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_shared").Output("libfoobar.so")

	foobarClippy := ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_shared").MaybeRule("clippy")

	ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_dylib").Output("libfoobar.dylib.so")

	foobarClippy := ctx.ModuleForTests("libfoobar", "android_arm64_armv8-a_dylib").MaybeRule("clippy")

	if foobarClippy.Rule != nil {

		t.Errorf("Clippy output for libfoobar is not empty")

	}

rust/compiler.go

+5 −13
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ type BaseCompilerProperties struct { 
	// list of rust dylib crate dependencies

	Dylibs []string `android:"arch_variant"`



	// list of rust automatic crate dependencies

	Rustlibs []string `android:"arch_variant"`



	// list of rust proc_macro crate dependencies

	Proc_macros []string `android:"arch_variant"`
@@ -100,8 +103,6 @@ type BaseCompilerProperties struct { 


type baseCompiler struct {

	Properties   BaseCompilerProperties

	depFlags     []string

	linkDirs     []string

	coverageFile android.Path //rustc generates a single gcno file



	// Install related
@@ -178,6 +179,7 @@ func (compiler *baseCompiler) compile(ctx ModuleContext, flags Flags, deps PathD 
func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {

	deps.Rlibs = append(deps.Rlibs, compiler.Properties.Rlibs...)

	deps.Dylibs = append(deps.Dylibs, compiler.Properties.Dylibs...)

	deps.Rustlibs = append(deps.Rustlibs, compiler.Properties.Rustlibs...)

	deps.ProcMacros = append(deps.ProcMacros, compiler.Properties.Proc_macros...)

	deps.StaticLibs = append(deps.StaticLibs, compiler.Properties.Static_libs...)

	deps.SharedLibs = append(deps.SharedLibs, compiler.Properties.Shared_libs...)
@@ -189,17 +191,7 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { 
				stdlib = stdlib + "_" + ctx.toolchain().RustTriple()

			}



			// This check is technically insufficient - on the host, where

			// static linking is the default, if one of our static

			// dependencies uses a dynamic library, we need to dynamically

			// link the stdlib as well.

			if (len(deps.Dylibs) > 0) || ctx.Device() {

				// Dynamically linked stdlib

				deps.Dylibs = append(deps.Dylibs, stdlib)

			} else if ctx.Host() && !ctx.TargetPrimary() {

				// Otherwise use the static in-tree stdlib for host secondary arch

				deps.Rlibs = append(deps.Rlibs, stdlib+".static")

			}

			deps.Rustlibs = append(deps.Rustlibs, stdlib)

		}

	}

	return deps

rust/config/allowed_list.go

+6 −4
Original line number Diff line number Diff line
@@ -15,13 +15,15 @@ var ( 
		"rust_library",

		"rust_library_dylib",

		"rust_library_rlib",

		"rust_library_shared",

		"rust_library_static",

		"rust_ffi",

		"rust_ffi_shared",

		"rust_ffi_static",

		"rust_library_host",

		"rust_library_host_dylib",

		"rust_library_host_rlib",

		"rust_library_host_shared",

		"rust_library_host_static",

		"rust_ffi_host",

		"rust_ffi_host_shared",

		"rust_ffi_host_static",

		"rust_proc_macro",

		"rust_test",

		"rust_test_host",