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

Add DeviceAbi to product variable to build setting export

Browse Source 
Change-Id: Ibcb9e77a28bf0c4c0915f7013a7408f65429ae15
This commit is contained in:
Romain Jobredeaux
2023-07-20 10:51:26 -04:00
parent 00d0d7af7d
commit cc1b67631c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bp2build/bp2build_product_config.go
View File

@@ -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_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: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: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 := "" result := ""
for _, suffix := range bazelPlatformSuffixes { for _, suffix := range bazelPlatformSuffixes {
result += " " + label + suffix + "\n" + buildSettings result += " " + label + suffix + "\n" + buildSettings
@@ -209,5 +210,9 @@ func starlarkMapToProductVariables(in map[string]starlark.Value) (android.Produc
if err != nil { if err != nil {
return result, err return result, err
} }
result.DeviceAbi, err = starlark_import.Unmarshal[[]string](in["DeviceAbi"])
if err != nil {
return result, err
}
return result, nil return result, nil
} }