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

Add testing android products

Browse Source 
These must be added in the soong_injection code as opposed to just
defined loosely in checked-in bzl files because the product_vars
select statement must be updated to support the new platforms.

Bug: 269577299
Test: b test --config=android //build/bazel/...
Change-Id: I7bba9af214896dd3b5938bae70b7c0cea4f75e41
This commit is contained in:
Cole Faust
2023-03-27 16:08:03 -07:00
parent 426b1c6c7f
commit ebc01a3225
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bp2build/bp2build_product_config.go
View File

@@ -85,6 +85,11 @@ alias(
# TODO: When we start generating the platforms for more than just the
# currently lunched, product, this select should have an arm for each product.
"@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}_constraint_value": "@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}_product_vars",
"@soong_injection//product_config_platforms/products/aosp_arm_for_testing:aosp_arm_for_testing_constraint_value": "@soong_injection//product_config_platforms/products/aosp_arm_for_testing:aosp_arm_for_testing_product_vars",
"@soong_injection//product_config_platforms/products/aosp_arm64_for_testing:aosp_arm64_for_testing_constraint_value": "@soong_injection//product_config_platforms/products/aosp_arm64_for_testing:aosp_arm64_for_testing_product_vars",
"@soong_injection//product_config_platforms/products/aosp_x86_for_testing:aosp_x86_for_testing_constraint_value": "@soong_injection//product_config_platforms/products/aosp_x86_for_testing:aosp_x86_for_testing_product_vars",
"@soong_injection//product_config_platforms/products/aosp_x86_64_for_testing:aosp_x86_64_for_testing_constraint_value": "@soong_injection//product_config_platforms/products/aosp_x86_64_for_testing:aosp_x86_64_for_testing_product_vars",
"@soong_injection//product_config_platforms/products/aosp_arm64_for_testing_no_compression:aosp_arm64_for_testing_no_compression_constraint_value": "@soong_injection//product_config_platforms/products/aosp_arm64_for_testing_no_compression:aosp_arm64_for_testing_no_compression_product_vars",
}),
)
`)),
@@ -122,5 +127,42 @@ flags:
`)),
}
// Add some products for testing
for _, arch := range []string{"arm", "arm64", "x86", "x86_64"} {
result = append(result, newFile(
fmt.Sprintf("product_config_platforms/products/aosp_%s_for_testing", arch),
"BUILD",
fmt.Sprintf(`
package(default_visibility=[
"@soong_injection//product_config_platforms:__subpackages__",
"@//build/bazel/product_config:__subpackages__",
])
load("@//build/bazel/tests/products:aosp_%s.variables.bzl", _soong_variables = "variables")
load("@//build/bazel/product_config:android_product.bzl", "android_product")
android_product(
name = "aosp_%s_for_testing",
soong_variables = _soong_variables,
)
`, arch, arch)))
}
result = append(result, newFile(
"product_config_platforms/products/aosp_arm64_for_testing_no_compression",
"BUILD",
`
package(default_visibility=[
"@soong_injection//product_config_platforms:__subpackages__",
"@//build/bazel/product_config:__subpackages__",
])
load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("@//build/bazel/tests/products:aosp_arm64.variables.bzl", _soong_variables = "variables")
load("@//build/bazel/product_config:android_product.bzl", "android_product")
android_product(
name = "aosp_arm64_for_testing_no_compression",
soong_variables = dicts.add(_soong_variables, {"CompressedApex": False}),
)
`))
return result, nil
}