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

Commit 400749d1 authored by Sam Delmerico's avatar Sam Delmerico
Browse files

Revert "add rust_toolchain_rustc_prebuilt module type" 

Revert submission 2605644-rulebuilder-ninja-vars

Reason for revert: b/299568218

Reverted changes: /q/submissionid:2605644-rulebuilder-ninja-vars

Change-Id: Ic3d1ba7e8a61427b52f31cc3f187c9d5a7d9a7bb
parent 5162ff14

android/prebuilt_build_tool.go

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package android 
import "path/filepath"



func init() {

	RegisterModuleType("prebuilt_build_tool", NewPrebuiltBuildTool)

	RegisterModuleType("prebuilt_build_tool", prebuiltBuildToolFactory)

}



type prebuiltBuildToolProperties struct {
@@ -101,6 +101,10 @@ var _ HostToolProvider = &prebuiltBuildTool{} 


// prebuilt_build_tool is to declare prebuilts to be used during the build, particularly for use

// in genrules with the "tools" property.

func prebuiltBuildToolFactory() Module {

	return NewPrebuiltBuildTool()

}



func NewPrebuiltBuildTool() Module {

	module := &prebuiltBuildTool{}

	module.AddProperties(&module.properties)

cc/testing.go

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 


	multitree.RegisterApiImportsModule(ctx)



	ctx.RegisterModuleType("prebuilt_build_tool", android.NewPrebuiltBuildTool)

	ctx.RegisterModuleType("cc_benchmark", BenchmarkFactory)

	ctx.RegisterModuleType("cc_object", ObjectFactory)

	ctx.RegisterModuleType("cc_genrule", GenRuleFactory)

rust/toolchain_library.go

+0 −48
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import ( 


	"android/soong/android"

	"android/soong/rust/config"



	"github.com/google/blueprint/proptools"

)



// This module is used to compile the rust toolchain libraries
@@ -35,8 +33,6 @@ func init() { 
		rustToolchainLibraryRlibFactory)

	android.RegisterModuleType("rust_toolchain_library_dylib",

		rustToolchainLibraryDylibFactory)

	android.RegisterModuleType("rust_toolchain_rustc_prebuilt",

		rustToolchainRustcPrebuiltFactory)

}



type toolchainLibraryProperties struct {
@@ -105,47 +101,3 @@ func rustSetToolchainSource(ctx android.LoadHookContext) { 
func GetRustPrebuiltVersion(ctx android.LoadHookContext) string {

	return ctx.AConfig().GetenvWithDefault("RUST_PREBUILTS_VERSION", config.RustDefaultVersion)

}
 


type toolchainRustcPrebuiltProperties struct {

	// path to rustc prebuilt, relative to the top of the toolchain source

	Toolchain_prebuilt_src *string

	// path to deps, relative to the top of the toolchain source

	Toolchain_deps []string

	// path to deps, relative to module directory

	Deps []string

}



func rustToolchainRustcPrebuiltFactory() android.Module {

	module := android.NewPrebuiltBuildTool()

	module.AddProperties(&toolchainRustcPrebuiltProperties{})

	android.AddLoadHook(module, func(ctx android.LoadHookContext) {

		var toolchainProps *toolchainRustcPrebuiltProperties

		for _, p := range ctx.Module().GetProperties() {

			toolchainProperties, ok := p.(*toolchainRustcPrebuiltProperties)

			if ok {

				toolchainProps = toolchainProperties

			}

		}



		if toolchainProps.Toolchain_prebuilt_src == nil {

			ctx.PropertyErrorf("toolchain_prebuilt_src", "must set path to rustc prebuilt")

		}



		prefix := "linux-x86/" + GetRustPrebuiltVersion(ctx)

		deps := make([]string, 0, len(toolchainProps.Toolchain_deps)+len(toolchainProps.Deps))

		for _, d := range toolchainProps.Toolchain_deps {

			deps = append(deps, path.Join(prefix, d))

		}

		deps = append(deps, toolchainProps.Deps...)



		props := struct {

			Src  *string

			Deps []string

		}{

			Src:  proptools.StringPtr(path.Join(prefix, *toolchainProps.Toolchain_prebuilt_src)),

			Deps: deps,

		}

		ctx.AppendProperties(&props)

	})

	return module

}