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

Do not sort after subtraction.

Browse Source 
This allows labels/strings to remain in their original order.

Test: go test bazel tests
Change-Id: I69f575df9e4a358fee4392ae48edf4550e463efb
This commit is contained in:
Liz Kammer
2021-10-11 15:40:35 -04:00
parent 7e1956643c
commit 9bad9d645e
4 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
bp2build/cc_library_static_conversion_test.go
View File

@@ -641,12 +641,12 @@ cc_library_static {
name = "foo_static",
srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [
"for-arm.c",
"not-for-x86.c",
"for-arm.c",
],
"//build/bazel/platforms/arch:x86": [
"for-x86.c",
"not-for-arm.c",
"for-x86.c",
],
"//conditions:default": [
"not-for-arm.c",
@@ -691,28 +691,28 @@ cc_library_static {
name = "foo_static",
srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [
"for-arm.c",
"not-for-arm64.c",
"not-for-x86.c",
"not-for-x86_64.c",
"for-arm.c",
],
"//build/bazel/platforms/arch:arm64": [
"for-arm64.c",
"not-for-arm.c",
"not-for-x86.c",
"not-for-x86_64.c",
"for-arm64.c",
],
"//build/bazel/platforms/arch:x86": [
"for-x86.c",
"not-for-arm.c",
"not-for-arm64.c",
"not-for-x86_64.c",
"for-x86.c",
],
"//build/bazel/platforms/arch:x86_64": [
"for-x86_64.c",
"not-for-arm.c",
"not-for-arm64.c",
"not-for-x86.c",
"for-x86_64.c",
],
"//conditions:default": [
"not-for-arm.c",
@@ -875,20 +875,20 @@ cc_library_static {
name = "foo_static2",
srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [
"for-lib32.c",
"not-for-lib64.c",
"for-lib32.c",
],
"//build/bazel/platforms/arch:arm64": [
"for-lib64.c",
"not-for-lib32.c",
"for-lib64.c",
],
"//build/bazel/platforms/arch:x86": [
"for-lib32.c",
"not-for-lib64.c",
"for-lib32.c",
],
"//build/bazel/platforms/arch:x86_64": [
"for-lib64.c",
"not-for-lib32.c",
"for-lib64.c",
],
"//conditions:default": [
"not-for-lib32.c",
@@ -942,36 +942,36 @@ cc_library_static {
name = "foo_static3",
srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [
"not-for-arm64.c",
"not-for-lib64.c",
"not-for-x86.c",
"not-for-x86_64.c",
"for-arm.c",
"for-lib32.c",
"not-for-arm64.c",
"not-for-lib64.c",
"not-for-x86.c",
"not-for-x86_64.c",
],
"//build/bazel/platforms/arch:arm64": [
"for-arm64.c",
"for-lib64.c",
"not-for-arm.c",
"not-for-lib32.c",
"not-for-x86.c",
"not-for-x86_64.c",
"for-arm64.c",
"for-lib64.c",
],
"//build/bazel/platforms/arch:x86": [
"for-lib32.c",
"for-x86.c",
"not-for-arm.c",
"not-for-arm64.c",
"not-for-lib64.c",
"not-for-x86_64.c",
"for-x86.c",
"for-lib32.c",
],
"//build/bazel/platforms/arch:x86_64": [
"for-lib64.c",
"for-x86_64.c",
"not-for-arm.c",
"not-for-arm64.c",
"not-for-lib32.c",
"not-for-x86.c",
"for-x86_64.c",
"for-lib64.c",
],
"//conditions:default": [
"not-for-arm.c",
@@ -1066,19 +1066,19 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static3",
srcs = [
"//dep:generated_hdr_other_pkg",
"//dep:generated_src_other_pkg",
":generated_hdr",
":generated_src",
"common.cpp",
":generated_hdr",
"//dep:generated_hdr_other_pkg",
":generated_src",
"//dep:generated_src_other_pkg",
] + select({
"//build/bazel/platforms/arch:x86": [
"//dep:generated_hdr_other_pkg_x86",
"for-x86.cpp",
"//dep:generated_hdr_other_pkg_x86",
],
"//conditions:default": [
":generated_src_not_x86",
"not-for-x86.cpp",
":generated_src_not_x86",
],
}) + select({
"//build/bazel/platforms/os:android": [