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

Commit 689d6f63 authored by Matthew Maurer's avatar Matthew Maurer
Browse files

rust: Move compiler interface to compiler.go 

Refactor cleanup

Bug: 309943184
Test: m nothing
Change-Id: I7dcb0af64a4db71fdc46c0876b22e5015c02438e
parent 38ec22a8

rust/compiler.go

+38 −0
Original line number Diff line number Diff line
@@ -34,6 +34,44 @@ const ( 
	DylibLinkage

)



type compiler interface {

	initialize(ctx ModuleContext)

	compilerFlags(ctx ModuleContext, flags Flags) Flags

	cfgFlags(ctx ModuleContext, flags Flags) Flags

	featureFlags(ctx ModuleContext, flags Flags) Flags

	compilerProps() []interface{}

	compile(ctx ModuleContext, flags Flags, deps PathDeps) buildOutput

	compilerDeps(ctx DepsContext, deps Deps) Deps

	crateName() string

	rustdoc(ctx ModuleContext, flags Flags, deps PathDeps) android.OptionalPath



	// Output directory in which source-generated code from dependencies is

	// copied. This is equivalent to Cargo's OUT_DIR variable.

	CargoOutDir() android.OptionalPath



	// CargoPkgVersion returns the value of the Cargo_pkg_version property.

	CargoPkgVersion() string



	// CargoEnvCompat returns whether Cargo environment variables should be used.

	CargoEnvCompat() bool



	inData() bool

	install(ctx ModuleContext)

	relativeInstallPath() string

	everInstallable() bool



	nativeCoverage() bool



	Disabled() bool

	SetDisabled()



	stdLinkage(ctx *depsContext) RustLinkage

	noStdlibs() bool



	unstrippedOutputFilePath() android.Path

	strippedOutputFilePath() android.OptionalPath

}



func (compiler *baseCompiler) edition() string {

	return proptools.StringDefault(compiler.Properties.Edition, config.DefaultEdition)

}

rust/rust.go

+0 −38
Original line number Diff line number Diff line
@@ -485,44 +485,6 @@ type RustLibrary struct { 
	CrateName string

}



type compiler interface {

	initialize(ctx ModuleContext)

	compilerFlags(ctx ModuleContext, flags Flags) Flags

	cfgFlags(ctx ModuleContext, flags Flags) Flags

	featureFlags(ctx ModuleContext, flags Flags) Flags

	compilerProps() []interface{}

	compile(ctx ModuleContext, flags Flags, deps PathDeps) buildOutput

	compilerDeps(ctx DepsContext, deps Deps) Deps

	crateName() string

	rustdoc(ctx ModuleContext, flags Flags, deps PathDeps) android.OptionalPath



	// Output directory in which source-generated code from dependencies is

	// copied. This is equivalent to Cargo's OUT_DIR variable.

	CargoOutDir() android.OptionalPath



	// CargoPkgVersion returns the value of the Cargo_pkg_version property.

	CargoPkgVersion() string



	// CargoEnvCompat returns whether Cargo environment variables should be used.

	CargoEnvCompat() bool



	inData() bool

	install(ctx ModuleContext)

	relativeInstallPath() string

	everInstallable() bool



	nativeCoverage() bool



	Disabled() bool

	SetDisabled()



	stdLinkage(ctx *depsContext) RustLinkage

	noStdlibs() bool



	unstrippedOutputFilePath() android.Path

	strippedOutputFilePath() android.OptionalPath

}



type exportedFlagsProducer interface {

	exportLinkDirs(...string)

	exportLinkObjects(...string)