Merge "Add DeviceAbi to product variable to build setting export" into main (66b27cb8) · Commits · e / os / android_build_soong

bp2build/bp2build_product_config.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -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
		}