diff --git a/build/envsetup.sh b/build/envsetup.sh index 1f38a186..2a87c71e 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -1,6 +1,9 @@ CLANG_VERSION=$(build/soong/scripts/get_clang_version.py) export LLVM_AOSP_PREBUILTS_VERSION="${CLANG_VERSION}" +RUST_VERSION=$(grep 'RustDefaultVersion =' build/soong/rust/config/global.go | awk '{print $3}' | awk -F '"' '{print $2}') +export RUST_AOSP_PREBUILTS_VERSION="${RUST_VERSION}" + # check to see if the supplied product is one we can build function check_product() { diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk index 2b3555ec..2c7b3d53 100644 --- a/config/BoardConfigKernel.mk +++ b/config/BoardConfigKernel.mk @@ -104,7 +104,7 @@ else endif TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_PREBUILT_TAG)/$(KERNEL_CLANG_VERSION) -TARGET_KERNEL_RUST_VERSION ?= 1.73.0c +TARGET_KERNEL_RUST_VERSION ?= $(RUST_AOSP_PREBUILTS_VERSION) ifneq ($(USE_CCACHE),) ifneq ($(CCACHE_EXEC),)