From cc1b67631c935eae6c7ba6b4f59a65ffa3f1b3dd Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Thu, 20 Jul 2023 10:51:26 -0400 Subject: [PATCH] Add DeviceAbi to product variable to build setting export Change-Id: Ibcb9e77a28bf0c4c0915f7013a7408f65429ae15 --- bp2build/bp2build_product_config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bp2build/bp2build_product_config.go b/bp2build/bp2build_product_config.go index 42a086695..c8067af05 100644 --- a/bp2build/bp2build_product_config.go +++ b/bp2build/bp2build_product_config.go @@ -183,6 +183,7 @@ func platformMappingSingleProduct(label string, productVariables *android.Produc buildSettings += fmt.Sprintf(" --//build/bazel/product_config:cfi_include_paths=%s\n", strings.Join(productVariables.CFIIncludePaths, ",")) buildSettings += fmt.Sprintf(" --//build/bazel/product_config:cfi_exclude_paths=%s\n", strings.Join(productVariables.CFIExcludePaths, ",")) buildSettings += fmt.Sprintf(" --//build/bazel/product_config:enable_cfi=%t\n", proptools.BoolDefault(productVariables.EnableCFI, true)) + buildSettings += fmt.Sprintf(" --//build/bazel/product_config:device_abi=%s\n", strings.Join(productVariables.DeviceAbi, ",")) result := "" for _, suffix := range bazelPlatformSuffixes { result += " " + label + suffix + "\n" + buildSettings @@ -209,5 +210,9 @@ func starlarkMapToProductVariables(in map[string]starlark.Value) (android.Produc if err != nil { return result, err } + result.DeviceAbi, err = starlark_import.Unmarshal[[]string](in["DeviceAbi"]) + if err != nil { + return result, err + } return result, nil }