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

Commit 9bd39fe8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rustdoc support."

parents 46b93848 06feee93

rust/Android.bp

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

        "compiler.go",

        "coverage.go",

        "doc.go",

        "fuzz.go",

        "image.go",

        "library.go",

rust/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ func (binary *binaryDecorator) compile(ctx ModuleContext, flags Flags, deps Path 
	flags.LinkFlags = append(flags.LinkFlags, deps.depLinkFlags...)

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



	TransformSrcToBinary(ctx, srcPath, deps, flags, outputFile, deps.linkDirs)

	TransformSrcToBinary(ctx, srcPath, deps, flags, outputFile)



	if binary.stripper.NeedsStrip(ctx) {

		strippedOutputFile := android.PathForModuleOut(ctx, "stripped", fileName)

rust/builder.go

+113 −47
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ var ( 
		},

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



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

	rustdoc = pctx.AndroidStaticRule("rustdoc",

		blueprint.RuleParams{

			Command: "rm -rf $outDir && " +

				"$envVars $rustdocCmd $rustdocFlags $in -o $outDir && " +

				"touch $out",

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

		},

		"rustdocFlags", "outDir", "envVars")



	_            = pctx.SourcePathVariable("clippyCmd", "${config.RustBin}/clippy-driver")

	clippyDriver = pctx.AndroidStaticRule("clippy",

		blueprint.RuleParams{
@@ -85,37 +95,37 @@ func init() { 
}



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

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

	outputFile android.WritablePath) buildOutput {

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



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

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

}



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

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

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

	outputFile android.WritablePath) buildOutput {

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

}



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

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

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

	outputFile android.WritablePath) buildOutput {

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

}



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

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

	outputFile android.WritablePath) buildOutput {

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

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

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

}



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

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

	outputFile android.WritablePath) buildOutput {

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

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

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

}



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

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

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

	flags Flags, outputFile android.WritablePath) buildOutput {

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

}



func rustLibsToPaths(libs RustLibraries) android.Paths {
@@ -126,26 +136,69 @@ func rustLibsToPaths(libs RustLibraries) android.Paths { 
	return paths

}



func makeLibFlags(deps PathDeps) []string {

	var libFlags []string



	// Collect library/crate flags

	for _, lib := range deps.RLibs {

		libFlags = append(libFlags, "--extern "+lib.CrateName+"="+lib.Path.String())

	}

	for _, lib := range deps.DyLibs {

		libFlags = append(libFlags, "--extern "+lib.CrateName+"="+lib.Path.String())

	}

	for _, proc_macro := range deps.ProcMacros {

		libFlags = append(libFlags, "--extern "+proc_macro.CrateName+"="+proc_macro.Path.String())

	}



	for _, path := range deps.linkDirs {

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

	}



	return libFlags

}



func rustEnvVars(ctx ModuleContext, deps PathDeps) []string {

	var envVars []string



	// libstd requires a specific environment variable to be set. This is

	// not officially documented and may be removed in the future. See

	// https://github.com/rust-lang/rust/blob/master/library/std/src/env.rs#L866.

	if ctx.RustModule().CrateName() == "std" {

		envVars = append(envVars, "STD_ENV_ARCH="+config.StdEnvArch[ctx.RustModule().Arch().ArchType])

	}



	if len(deps.SrcDeps) > 0 {

		moduleGenDir := ctx.RustModule().compiler.CargoOutDir()

		// We must calculate an absolute path for OUT_DIR since Rust's include! macro (which normally consumes this)

		// assumes that paths are relative to the source file.

		var outDirPrefix string

		if !filepath.IsAbs(moduleGenDir.String()) {

			// If OUT_DIR is not absolute, we use $$PWD to generate an absolute path (os.Getwd() returns '/')

			outDirPrefix = "$$PWD/"

		} else {

			// If OUT_DIR is absolute, then moduleGenDir will be an absolute path, so we don't need to set this to anything.

			outDirPrefix = ""

		}

		envVars = append(envVars, "OUT_DIR="+filepath.Join(outDirPrefix, moduleGenDir.String()))

	}



	return envVars

}



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

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

	outputFile android.WritablePath, crate_type string) buildOutput {



	var inputs android.Paths

	var implicits android.Paths

	var envVars []string

	var output buildOutput

	var libFlags, rustcFlags, linkFlags []string

	var rustcFlags, linkFlags []string

	var implicitOutputs android.WritablePaths



	output.outputFile = outputFile

	crateName := ctx.RustModule().CrateName()

	targetTriple := ctx.toolchain().RustTriple()



	// libstd requires a specific environment variable to be set. This is

	// not officially documented and may be removed in the future. See

	// https://github.com/rust-lang/rust/blob/master/library/std/src/env.rs#L866.

	if crateName == "std" {

		envVars = append(envVars, "STD_ENV_ARCH="+config.StdEnvArch[ctx.RustModule().Arch().ArchType])

	}

	envVars := rustEnvVars(ctx, deps)



	inputs = append(inputs, main)
@@ -168,20 +221,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
	linkFlags = append(linkFlags, flags.GlobalLinkFlags...)

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



	// Collect library/crate flags

	for _, lib := range deps.RLibs {

		libFlags = append(libFlags, "--extern "+lib.CrateName+"="+lib.Path.String())

	}

	for _, lib := range deps.DyLibs {

		libFlags = append(libFlags, "--extern "+lib.CrateName+"="+lib.Path.String())

	}

	for _, proc_macro := range deps.ProcMacros {

		libFlags = append(libFlags, "--extern "+proc_macro.CrateName+"="+proc_macro.Path.String())

	}



	for _, path := range linkDirs {

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

	}

	libFlags := makeLibFlags(deps)



	// Collect dependencies

	implicits = append(implicits, rustLibsToPaths(deps.RLibs)...)
@@ -217,18 +257,6 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 
			},

		})

		implicits = append(implicits, outputs.Paths()...)



		// We must calculate an absolute path for OUT_DIR since Rust's include! macro (which normally consumes this)

		// assumes that paths are relative to the source file.

		var outDirPrefix string

		if !filepath.IsAbs(moduleGenDir.String()) {

			// If OUT_DIR is not absolute, we use $$PWD to generate an absolute path (os.Getwd() returns '/')

			outDirPrefix = "$$PWD/"

		} else {

			// If OUT_DIR is absolute, then moduleGenDir will be an absolute path, so we don't need to set this to anything.

			outDirPrefix = ""

		}

		envVars = append(envVars, "OUT_DIR="+filepath.Join(outDirPrefix, moduleGenDir.String()))

	}



	envVars = append(envVars, "ANDROID_RUST_VERSION="+config.RustDefaultVersion)
@@ -272,3 +300,41 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl 


	return output

}



func Rustdoc(ctx ModuleContext, main android.Path, deps PathDeps,

	flags Flags) android.ModuleOutPath {



	rustdocFlags := append([]string{}, flags.RustdocFlags...)

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



	targetTriple := ctx.toolchain().RustTriple()



	// Collect rustc flags

	if targetTriple != "" {

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

	}



	crateName := ctx.RustModule().CrateName()

	if crateName != "" {

		rustdocFlags = append(rustdocFlags, "--crate-name "+crateName)

	}



	rustdocFlags = append(rustdocFlags, makeLibFlags(deps)...)

	docTimestampFile := android.PathForModuleOut(ctx, "rustdoc.timestamp")

	docDir := android.PathForOutput(ctx, "rustdoc", ctx.ModuleName())



	ctx.Build(pctx, android.BuildParams{

		Rule:        rustdoc,

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

		Output:      docTimestampFile,

		Input:       main,

		Implicit:    ctx.RustModule().unstrippedOutputFile.Path(),

		Args: map[string]string{

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

			"outDir":       docDir.String(),

			"envVars":      strings.Join(rustEnvVars(ctx, deps), " "),

		},

	})



	return docTimestampFile

}

rust/compiler.go

+9 −0
Original line number Diff line number Diff line
@@ -239,7 +239,10 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag 
	flags.RustFlags = append(flags.RustFlags, compiler.Properties.Flags...)

	flags.RustFlags = append(flags.RustFlags, compiler.cfgsToFlags()...)

	flags.RustFlags = append(flags.RustFlags, compiler.featuresToFlags()...)

	flags.RustdocFlags = append(flags.RustdocFlags, compiler.cfgsToFlags()...)

	flags.RustdocFlags = append(flags.RustdocFlags, compiler.featuresToFlags()...)

	flags.RustFlags = append(flags.RustFlags, "--edition="+compiler.edition())

	flags.RustdocFlags = append(flags.RustdocFlags, "--edition="+compiler.edition())

	flags.LinkFlags = append(flags.LinkFlags, compiler.Properties.Ld_flags...)

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, config.GlobalRustFlags...)

	flags.GlobalRustFlags = append(flags.GlobalRustFlags, ctx.toolchain().ToolchainRustFlags())
@@ -272,6 +275,12 @@ func (compiler *baseCompiler) compile(ctx ModuleContext, flags Flags, deps PathD 
	panic(fmt.Errorf("baseCrater doesn't know how to crate things!"))

}



func (compiler *baseCompiler) rustdoc(ctx ModuleContext, flags Flags,

	deps PathDeps) android.OptionalPath {



	return android.OptionalPath{}

}



func (compiler *baseCompiler) initialize(ctx ModuleContext) {

	compiler.cargoOutDir = android.PathForModuleOut(ctx, genSubDir)

}

rust/doc.go

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// Copyright 2021 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package rust



import (

	"android/soong/android"

)



func init() {

	android.RegisterSingletonType("rustdoc", RustdocSingleton)

}



func RustdocSingleton() android.Singleton {

	return &rustdocSingleton{}

}



type rustdocSingleton struct{}



func (n *rustdocSingleton) GenerateBuildActions(ctx android.SingletonContext) {

	ctx.VisitAllModules(func(module android.Module) {

		if !module.Enabled() {

			return

		}



		if m, ok := module.(*Module); ok {

			if m.docTimestampFile.Valid() {

				ctx.Phony("rustdoc", m.docTimestampFile.Path())

			}

		}

	})

}