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

Commit 2d1bf531 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Split Rust crate builds into compile and link phases."" into main

parents 72928074 004bd3f5

apex/apex_test.go

+2 −2
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ func TestApexWithStubs(t *testing.T) { 
	// Ensure that stub dependency from a rust module is not included

	ensureNotContains(t, copyCmds, "image.apex/lib64/libfoo.shared_from_rust.so")

	// The rust module is linked to the stub cc library

	rustDeps := ctx.ModuleForTests("foo.rust", "android_arm64_armv8-a_apex10000").Rule("rustLink").Args["linkFlags"]

	rustDeps := ctx.ModuleForTests("foo.rust", "android_arm64_armv8-a_apex10000").Rule("rustc").Args["linkFlags"]

	ensureContains(t, rustDeps, "libfoo.shared_from_rust/android_arm64_armv8-a_shared_current/libfoo.shared_from_rust.so")

	ensureNotContains(t, rustDeps, "libfoo.shared_from_rust/android_arm64_armv8-a_shared/libfoo.shared_from_rust.so")
@@ -1024,7 +1024,7 @@ func TestApexCanUsePrivateApis(t *testing.T) { 
	mylibLdFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_shared_apex10000").Rule("ld").Args["libFlags"]

	ensureNotContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared_current/mylib2.so")

	ensureContains(t, mylibLdFlags, "mylib2/android_arm64_armv8-a_shared/mylib2.so")

	rustDeps := ctx.ModuleForTests("foo.rust", "android_arm64_armv8-a_apex10000").Rule("rustLink").Args["linkFlags"]

	rustDeps := ctx.ModuleForTests("foo.rust", "android_arm64_armv8-a_apex10000").Rule("rustc").Args["linkFlags"]

	ensureNotContains(t, rustDeps, "libfoo.shared_from_rust/android_arm64_armv8-a_shared_current/libfoo.shared_from_rust.so")

	ensureContains(t, rustDeps, "libfoo.shared_from_rust/android_arm64_armv8-a_shared/libfoo.shared_from_rust.so")

}

rust/binary.go

+2 −5
Original line number Diff line number Diff line
@@ -77,14 +77,11 @@ func NewRustBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator 
func (binary *binaryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags {

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



	if ctx.Os().Linux() {

		flags.LinkFlags = append(flags.LinkFlags, "-Wl,--gc-sections")

	}



	if ctx.toolchain().Bionic() {

		// no-undefined-version breaks dylib compilation since __rust_*alloc* functions aren't defined,

		// but we can apply this to binaries.

		flags.LinkFlags = append(flags.LinkFlags,

			"-Wl,--gc-sections",

			"-Wl,-z,nocopyreloc",

			"-Wl,--no-undefined-version")
@@ -149,7 +146,7 @@ func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps Path 


	flags.RustFlags = append(flags.RustFlags, deps.depFlags...)

	flags.LinkFlags = append(flags.LinkFlags, deps.depLinkFlags...)

	flags.LinkFlags = append(flags.LinkFlags, deps.linkObjects.Strings()...)

	flags.LinkFlags = append(flags.LinkFlags, deps.linkObjects...)



	if binary.stripper.NeedsStrip(ctx) {

		strippedOutputFile := outputFile

rust/binary_test.go

+3 −4
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ func TestBootstrap(t *testing.T) { 
			bootstrap: true,

		}`)



	foo := ctx.ModuleForTests("foo", "android_arm64_armv8-a").Rule("rustLink")

	foo := ctx.ModuleForTests("foo", "android_arm64_armv8-a").Rule("rustc")



	flag := "-Wl,-dynamic-linker,/system/bin/bootstrap/linker64"

	if !strings.Contains(foo.Args["linkFlags"], flag) {
@@ -167,11 +167,10 @@ func TestStaticBinaryFlags(t *testing.T) { 
		}`)



	fizzOut := ctx.ModuleForTests("fizz", "android_arm64_armv8-a").Rule("rustc")

	fizzOutLink := ctx.ModuleForTests("fizz", "android_arm64_armv8-a").Rule("rustLink")

	fizzMod := ctx.ModuleForTests("fizz", "android_arm64_armv8-a").Module().(*Module)



	flags := fizzOut.Args["rustcFlags"]

	linkFlags := fizzOutLink.Args["linkFlags"]

	linkFlags := fizzOut.Args["linkFlags"]

	if !strings.Contains(flags, "-C relocation-model=static") {

		t.Errorf("static binary missing '-C relocation-model=static' in rustcFlags, found: %#v", flags)

	}
@@ -201,7 +200,7 @@ func TestLinkObjects(t *testing.T) { 
			name: "libfoo",

		}`)



	fizzBuzz := ctx.ModuleForTests("fizz-buzz", "android_arm64_armv8-a").Rule("rustLink")

	fizzBuzz := ctx.ModuleForTests("fizz-buzz", "android_arm64_armv8-a").Rule("rustc")

	linkFlags := fizzBuzz.Args["linkFlags"]

	if !strings.Contains(linkFlags, "/libfoo.so") {

		t.Errorf("missing shared dependency 'libfoo.so' in linkFlags: %#v", linkFlags)

rust/builder.go

+52 −67
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ import ( 


var (

	_     = pctx.SourcePathVariable("rustcCmd", "${config.RustBin}/rustc")

	_     = pctx.SourcePathVariable("mkcraterspCmd", "build/soong/scripts/mkcratersp.py")

	rustc = pctx.AndroidStaticRule("rustc",

		blueprint.RuleParams{

			Command: "$envVars $rustcCmd " +

				"-C linker=$mkcraterspCmd " +

				"-C linker=${config.RustLinker} " +

				"-C link-args=\"${crtBegin} ${earlyLinkFlags} ${linkFlags} ${crtEnd}\" " +

				"--emit link -o $out --emit dep-info=$out.d.raw $in ${libFlags} $rustcFlags" +

				" && grep \"^$out:\" $out.d.raw > $out.d",

			CommandDeps: []string{"$rustcCmd", "$mkcraterspCmd"},

			CommandDeps: []string{"$rustcCmd"},

			// Rustc deps-info writes out make compatible dep files: https://github.com/rust-lang/rust/issues/7633

			// Rustc emits unneeded dependency lines for the .d and input .rs files.

			// Those extra lines cause ninja warning:
@@ -42,12 +42,7 @@ var ( 
			Deps:    blueprint.DepsGCC,

			Depfile: "$out.d",

		},

		"rustcFlags", "libFlags", "envVars")

	rustLink = pctx.AndroidStaticRule("rustLink",

		blueprint.RuleParams{

			Command: "${config.RustLinker} -o $out ${crtBegin} ${earlyLinkFlags} @$in ${linkFlags} ${crtEnd}",

		},

		"earlyLinkFlags", "linkFlags", "crtBegin", "crtEnd")

		"rustcFlags", "earlyLinkFlags", "linkFlags", "libFlags", "crtBegin", "crtEnd", "envVars")



	_       = pctx.SourcePathVariable("rustdocCmd", "${config.RustBin}/rustdoc")

	rustdoc = pctx.AndroidStaticRule("rustdoc",
@@ -106,13 +101,14 @@ var ( 
				`KYTHE_CANONICALIZE_VNAME_PATHS=prefer-relative ` +

				`$rustExtractor $envVars ` +

				`$rustcCmd ` +

				`-C linker=true ` +

				`-C linker=${config.RustLinker} ` +

				`-C link-args="${crtBegin} ${linkFlags} ${crtEnd}" ` +

				`$in ${libFlags} $rustcFlags`,

			CommandDeps:    []string{"$rustExtractor", "$kytheVnames"},

			Rspfile:        "${out}.rsp",

			RspfileContent: "$in",

		},

		"rustcFlags", "libFlags", "envVars")

		"rustcFlags", "linkFlags", "libFlags", "crtBegin", "crtEnd", "envVars")

)



type buildOutput struct {
@@ -242,12 +238,6 @@ func rustEnvVars(ctx ModuleContext, deps PathDeps) []string { 
		}

	}



	envVars = append(envVars, "AR=${cc_config.ClangBin}/llvm-ar")



	if ctx.Darwin() {

		envVars = append(envVars, "ANDROID_RUST_DARWIN=true")

	}



	return envVars

}
@@ -255,7 +245,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
	outputFile android.WritablePath, crateType string) buildOutput {



	var inputs android.Paths

	var implicits, linkImplicits, linkOrderOnly android.Paths

	var implicits android.Paths

	var orderOnly android.Paths

	var output buildOutput

	var rustcFlags, linkFlags []string

	var earlyLinkFlags string
@@ -319,15 +310,15 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
	implicits = append(implicits, rustLibsToPaths(deps.RLibs)...)

	implicits = append(implicits, rustLibsToPaths(deps.DyLibs)...)

	implicits = append(implicits, rustLibsToPaths(deps.ProcMacros)...)

	implicits = append(implicits, deps.AfdoProfiles...)

	implicits = append(implicits, deps.StaticLibs...)

	implicits = append(implicits, deps.SharedLibDeps...)

	implicits = append(implicits, deps.srcProviderFiles...)

	implicits = append(implicits, deps.WholeStaticLibs...)

	implicits = append(implicits, deps.AfdoProfiles...)



	linkImplicits = append(linkImplicits, deps.LibDeps...)

	linkImplicits = append(linkImplicits, deps.CrtBegin...)

	linkImplicits = append(linkImplicits, deps.CrtEnd...)

	implicits = append(implicits, deps.CrtBegin...)

	implicits = append(implicits, deps.CrtEnd...)



	linkOrderOnly = append(linkOrderOnly, deps.linkObjects...)

	orderOnly = append(orderOnly, deps.SharedLibs...)



	if len(deps.SrcDeps) > 0 {

		moduleGenDir := ctx.RustModule().compiler.CargoOutDir()
@@ -353,14 +344,29 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		implicits = append(implicits, outputs.Paths()...)

	}



	envVars = append(envVars, "ANDROID_RUST_VERSION="+config.GetRustVersion(ctx))



	if ctx.RustModule().compiler.CargoEnvCompat() {

		if _, ok := ctx.RustModule().compiler.(*binaryDecorator); ok {

			envVars = append(envVars, "CARGO_BIN_NAME="+strings.TrimSuffix(outputFile.Base(), outputFile.Ext()))

		}

		envVars = append(envVars, "CARGO_CRATE_NAME="+ctx.RustModule().CrateName())

		pkgVersion := ctx.RustModule().compiler.CargoPkgVersion()

		if pkgVersion != "" {

			envVars = append(envVars, "CARGO_PKG_VERSION="+pkgVersion)

		}

	}



	if flags.Clippy {

		clippyFile := android.PathForModuleOut(ctx, outputFile.Base()+".clippy")

		ctx.Build(pctx, android.BuildParams{

			Rule:            clippyDriver,

			Description:     "clippy " + main.Rel(),

			Output:          clippyFile,

			ImplicitOutputs: nil,

			Inputs:          inputs,

			Implicits:       implicits,

			OrderOnly:       orderOnly,

			Args: map[string]string{

				"rustcFlags":  strings.Join(rustcFlags, " "),

				"libFlags":    strings.Join(libFlags, " "),
@@ -372,48 +378,23 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
		implicits = append(implicits, clippyFile)

	}



	rustcOutputFile := outputFile

	var rustcImplicitOutputs android.WritablePaths

	usesLinker := crateType == "bin" || crateType == "dylib" || crateType == "cdylib" || crateType == "proc-macro"

	if usesLinker {

		rustcOutputFile = android.PathForModuleOut(ctx, outputFile.Base()+".rsp")

		rustcImplicitOutputs = android.WritablePaths{

			android.PathForModuleOut(ctx, rustcOutputFile.Base()+".whole.a"),

			android.PathForModuleOut(ctx, rustcOutputFile.Base()+".a"),

		}



	}



	ctx.Build(pctx, android.BuildParams{

		Rule:        rustc,

		Description: "rustc " + main.Rel(),

		Output:          rustcOutputFile,

		Output:      outputFile,

		Inputs:      inputs,

		Implicits:   implicits,

		ImplicitOutputs: rustcImplicitOutputs,

		OrderOnly:   orderOnly,

		Args: map[string]string{

			"rustcFlags":     strings.Join(rustcFlags, " "),

			"libFlags":   strings.Join(libFlags, " "),

			"envVars":    strings.Join(envVars, " "),

		},

	})



	if usesLinker {

		ctx.Build(pctx, android.BuildParams{

			Rule:        rustLink,

			Description: "rustLink " + main.Rel(),

			Output:      outputFile,

			Inputs:      android.Paths{rustcOutputFile},

			Implicits:   linkImplicits,

			OrderOnly:   linkOrderOnly,

			Args: map[string]string{

			"earlyLinkFlags": earlyLinkFlags,

			"linkFlags":      strings.Join(linkFlags, " "),

			"libFlags":       strings.Join(libFlags, " "),

			"crtBegin":       strings.Join(deps.CrtBegin.Strings(), " "),

			"crtEnd":         strings.Join(deps.CrtEnd.Strings(), " "),

			"envVars":        strings.Join(envVars, " "),

		},

	})

	}



	if flags.EmitXrefs {

		kytheFile := android.PathForModuleOut(ctx, outputFile.Base()+".kzip")
@@ -423,9 +404,13 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
			Output:      kytheFile,

			Inputs:      inputs,

			Implicits:   implicits,

			OrderOnly:   orderOnly,

			Args: map[string]string{

				"rustcFlags": strings.Join(rustcFlags, " "),

				"linkFlags":  strings.Join(linkFlags, " "),

				"libFlags":   strings.Join(libFlags, " "),

				"crtBegin":   strings.Join(deps.CrtBegin.Strings(), " "),

				"crtEnd":     strings.Join(deps.CrtEnd.Strings(), " "),

				"envVars":    strings.Join(envVars, " "),

			},

		})

rust/builder_test.go

+0 −9
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ func TestCompilationOutputFiles(t *testing.T) { 
			expectedFiles: []string{

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.clippy",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp.a",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp.whole.a",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/unstripped/libfizz_buzz.dylib.so",

				"out/soong/target/product/test_device/system/lib64/libfizz_buzz.dylib.so",

				"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/meta_lic",
@@ -112,9 +109,6 @@ func TestCompilationOutputFiles(t *testing.T) { 
			expectedFiles: []string{

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.clippy",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp.a",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp.whole.a",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/unstripped/fizz_buzz",

				"out/soong/target/product/test_device/system/bin/fizz_buzz",

				"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/meta_lic",
@@ -138,9 +132,6 @@ func TestCompilationOutputFiles(t *testing.T) { 
			expectedFiles: []string{

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.clippy",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp.a",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp.whole.a",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/unstripped/librust_ffi.so",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/unstripped/librust_ffi.so.toc",

				"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/meta_lic",