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

Commit 1c1c8d1c authored by Ivan Lozano's avatar Ivan Lozano Committed by Gerrit Code Review
Browse files

Merge "Add Rust fuzzing support."

parents c203ed42 6cd99e6a

rust/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ bootstrap_go_package { 
        "clippy.go",

        "compiler.go",

        "coverage.go",

        "fuzz.go",

        "image.go",

        "library.go",

        "prebuilt.go",
@@ -22,6 +23,7 @@ bootstrap_go_package { 
        "project_json.go",

        "protobuf.go",

        "rust.go",

        "sanitize.go",

        "strip.go",

        "source_provider.go",

        "test.go",
@@ -34,6 +36,7 @@ bootstrap_go_package { 
        "clippy_test.go",

        "compiler_test.go",

        "coverage_test.go",

        "fuzz_test.go",

        "image_test.go",

        "library_test.go",

        "project_json_test.go",

rust/builder.go

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ func init() { 


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

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

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

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



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

}
@@ -103,13 +103,13 @@ func TransformSrctoDylib(ctx ModuleContext, mainSrc android.Path, deps PathDeps, 


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

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

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

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

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

}



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

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

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

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

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

}

rust/compiler.go

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ type baseCompiler struct { 
	relative string

	path     android.InstallPath

	location installLocation

	sanitize *sanitize



	coverageOutputZipFile android.OptionalPath

	distFile              android.OptionalPath

rust/config/arm64_device.go

+6 −2
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ func (t *toolchainArm64) Supported() bool { 
	return true

}



func (toolchainArm64) LibclangRuntimeLibraryArch() string {

	return "aarch64"

}



func Arm64ToolchainFactory(arch android.Arch) Toolchain {

	archVariant := arch.ArchVariant

	if archVariant == "" {

rust/config/arm_device.go

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ func (t *toolchainArm) Supported() bool { 
	return true

}



func (toolchainArm) LibclangRuntimeLibraryArch() string {

	return "arm"

}



func ArmToolchainFactory(arch android.Arch) Toolchain {

	toolchainRustFlags := []string{

		"${config.ArmToolchainRustFlags}",