Export RustDefaultVersion to Bazel
The config constant is consumed by rust toolchain implemented in aosp/2709668. Bug: 295918553 Test: go test Change-Id: I0a28a802ad28f6ee24dfb1b5bdab72094534ae04
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
"android/soong/cc"
|
||||
cc_config "android/soong/cc/config"
|
||||
java_config "android/soong/java/config"
|
||||
rust_config "android/soong/rust/config"
|
||||
"android/soong/starlark_fmt"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
@@ -37,6 +38,9 @@ func soongInjectionFiles(cfg android.Config, metrics CodegenMetrics) ([]BazelFil
|
||||
files = append(files, newFile("java_toolchain", GeneratedBuildFileName, "")) // Creates a //java_toolchain package.
|
||||
files = append(files, newFile("java_toolchain", "constants.bzl", java_config.BazelJavaToolchainVars(cfg)))
|
||||
|
||||
files = append(files, newFile("rust_toolchain", GeneratedBuildFileName, "")) // Creates a //rust_toolchain package.
|
||||
files = append(files, newFile("rust_toolchain", "constants.bzl", rust_config.BazelRustToolchainVars(cfg)))
|
||||
|
||||
files = append(files, newFile("apex_toolchain", GeneratedBuildFileName, "")) // Creates a //apex_toolchain package.
|
||||
apexToolchainVars, err := apex.BazelApexToolchainVars()
|
||||
if err != nil {
|
||||
|
@@ -116,6 +116,14 @@ func TestCreateBazelFiles_Bp2Build_CreatesDefaultFiles(t *testing.T) {
|
||||
dir: "java_toolchain",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "rust_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
},
|
||||
{
|
||||
dir: "rust_toolchain",
|
||||
basename: "constants.bzl",
|
||||
},
|
||||
{
|
||||
dir: "apex_toolchain",
|
||||
basename: GeneratedBuildFileName,
|
||||
|
@@ -21,9 +21,10 @@ import (
|
||||
_ "android/soong/cc/config"
|
||||
)
|
||||
|
||||
var pctx = android.NewPackageContext("android/soong/rust/config")
|
||||
|
||||
var (
|
||||
pctx = android.NewPackageContext("android/soong/rust/config")
|
||||
exportedVars = android.NewExportedVariables(pctx)
|
||||
|
||||
RustDefaultVersion = "1.71.0"
|
||||
RustDefaultBase = "prebuilts/rust/"
|
||||
DefaultEdition = "2021"
|
||||
@@ -105,6 +106,7 @@ func init() {
|
||||
|
||||
pctx.StaticVariable("DeviceGlobalLinkFlags", strings.Join(deviceGlobalLinkFlags, " "))
|
||||
|
||||
exportedVars.ExportStringStaticVariable("RUST_DEFAULT_VERSION", RustDefaultVersion)
|
||||
}
|
||||
|
||||
func getRustVersionPctx(ctx android.PackageVarContext) string {
|
||||
@@ -117,3 +119,8 @@ func GetRustVersion(ctx android.PathContext) string {
|
||||
}
|
||||
return RustDefaultVersion
|
||||
}
|
||||
|
||||
// BazelRustToolchainVars returns a string with
|
||||
func BazelRustToolchainVars(config android.Config) string {
|
||||
return android.BazelToolchainVars(config, exportedVars)
|
||||
}
|
||||
|
Reference in New Issue
Block a user