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

Commit cfeec1c2 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

rust: Remove unnecessary escaping in grep call 

Modules with special characters wouldn't build correctly because $out
was being double escaped -- once in the build command and once by Soong
itself.

Remove the escape in the build command and just let Soong escape as
necessary.

Bug: 320578837
Test: Module with @ in name builds
Change-Id: Ic2554b9c07f37783287e1ebdeb06ef8b7b66a296
parent f875565c

rust/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ var ( 
				"-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",

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

			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.