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

Merge "Add DeviceAbi to product variable to build setting export" into main am: 66b27cb853

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2667476

Change-Id: If46017b04e96315c3ef3742126c52493144146cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-07-21 19:15:49 +00:00
committed by Automerger Merge Worker
parent 572adcd6ef 66b27cb853
commit a71e3edc69
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_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
}