From 95c5cf88bd23e76c80554428d91d4da2d407ef28 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 3 Aug 2023 13:49:27 -0700 Subject: [PATCH] Fix kernel build tools That build doesn't set platform_sdk_version. Bug: 269577299 Test: ./prebuilts/kernel-build-tools/build-prebuilts.sh on the kernel-build-tools branch Change-Id: I68eb33bfb80770cef9c3a9c5e01f1ed746a2d069 --- bp2build/bp2build_product_config.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bp2build/bp2build_product_config.go b/bp2build/bp2build_product_config.go index db478db35..43d5b5701 100644 --- a/bp2build/bp2build_product_config.go +++ b/bp2build/bp2build_product_config.go @@ -189,6 +189,11 @@ func platformMappingSingleProduct(label string, productVariables *android.Produc targetBuildVariant = "userdebug" } + platform_sdk_version := -1 + if productVariables.Platform_sdk_version != nil { + platform_sdk_version = *productVariables.Platform_sdk_version + } + for _, suffix := range bazelPlatformSuffixes { result.WriteString(" ") result.WriteString(label) @@ -223,7 +228,7 @@ func platformMappingSingleProduct(label string, productVariables *android.Produc result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:platform_version_name=%s\n", proptools.String(productVariables.Platform_version_name))) result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:product_brand=%s\n", productVariables.ProductBrand)) result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:product_manufacturer=%s\n", productVariables.ProductManufacturer)) - result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:platform_sdk_version=%d\n", *productVariables.Platform_sdk_version)) + result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:platform_sdk_version=%d\n", platform_sdk_version)) result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:safestack=%t\n", proptools.Bool(productVariables.Safestack))) result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:target_build_variant=%s\n", targetBuildVariant)) result.WriteString(fmt.Sprintf(" --//build/bazel/product_config:treble_linker_namespaces=%t\n", proptools.Bool(productVariables.Treble_linker_namespaces)))