StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export RustDefaultVersion to Bazel am: 80f6b2147f am: 4bb0237336

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2724373

Change-Id: I95671e896316524eb230ae0f17a2a25bf7ffa5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinh Tran
2023-08-24 14:10:52 +00:00
committed by Automerger Merge Worker
parent 0b146ce790 4bb0237336
commit 8dcf0c9863
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bp2build/conversion.go
View File

@@ -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 {

8
bp2build/conversion_test.go
View File

@@ -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,

11
rust/config/global.go
View File

@@ -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)
}