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

Merge "Move the testing platforms out of soong_injection"

Browse Source
This commit is contained in:
Cole Faust
2023-03-31 00:17:33 +00:00
committed by Gerrit Code Review
parent 97f5966f49 117bb747a4
commit e28bde81fd
1 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
bp2build/bp2build_product_config.go
View File

@@ -78,20 +78,18 @@ alias(
# currently lunched, product, turn this into a select with an arm for each product. # currently lunched, product, turn this into a select with an arm for each product.
actual = "@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}", actual = "@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}",
) )
`)),
alias( newFile(
name = "product_vars", "product_config_platforms",
actual = select({ "product_labels.bzl",
# TODO: When we start generating the platforms for more than just the productReplacer.Replace(`
# currently lunched, product, this select should have an arm for each product. # This file keeps a list of all the products in the android source tree, because they're
"@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}_constraint_value": "@soong_injection//{PRODUCT_FOLDER}:{PRODUCT}-{VARIANT}_product_vars", # discovered as part of a preprocessing step before bazel runs.
"@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", # TODO: When we start generating the platforms for more than just the
"@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", # currently lunched product, they should all be listed here
"@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", product_labels = [
"@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_FOLDER}:{PRODUCT}-{VARIANT}"
"@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", ]
}),
)
`)), `)),
newFile( newFile(
"product_config_platforms", "product_config_platforms",
@@ -127,42 +125,5 @@ 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 return result, nil
} }