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

Remove Linkstatic field for static cases

Browse Source 
With the explicit implementation of cc_library_shared,
this is now redundant for both, so remove it.

Test: cc_library_static_conversion_test.go
Test: mixed_{libc,droid}.sh
Change-Id: I6e7733ca08c254562e95e70d93c9f519719d8a18
This commit is contained in:
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
2021-09-14 14:54:00 +00:00
parent 33ce5d6c0e
commit a5474e36c5
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bp2build/cc_library_static_conversion_test.go
View File

@@ -202,7 +202,6 @@ cc_library_static {
":static_lib_1", ":static_lib_1",
":static_lib_2", ":static_lib_2",
], ],
linkstatic = True,
local_includes = [ local_includes = [
"local_include_dir_1", "local_include_dir_1",
"local_include_dir_2", "local_include_dir_2",
@@ -251,7 +250,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
absolute_includes = ["subpackage"], absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = ["."], local_includes = ["."],
)`}, )`},
}) })
@@ -278,7 +276,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
export_includes = ["subpackage"], export_includes = ["subpackage"],
linkstatic = True,
)`}, )`},
}) })
} }
@@ -304,7 +301,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
export_system_includes = ["subpackage"], export_system_includes = ["subpackage"],
linkstatic = True,
)`}, )`},
}) })
} }
@@ -347,7 +343,6 @@ cc_library_static {
"subpackage3/subsubpackage", "subpackage3/subsubpackage",
], ],
export_includes = ["./exported_subsubpackage"], export_includes = ["./exported_subsubpackage"],
linkstatic = True,
local_includes = [ local_includes = [
"subsubpackage2", "subsubpackage2",
".", ".",
@@ -378,7 +373,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
absolute_includes = ["subpackage"], absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = ["subpackage2"], local_includes = ["subpackage2"],
)`}, )`},
}) })
@@ -408,7 +402,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
absolute_includes = ["subpackage"], absolute_includes = ["subpackage"],
linkstatic = True,
local_includes = [ local_includes = [
"subpackage2", "subpackage2",
".", ".",
@@ -444,7 +437,6 @@ cc_library_static {
"//build/bazel/platforms/arch:arm64": [":static_dep"], "//build/bazel/platforms/arch:arm64": [":static_dep"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
whole_archive_deps = select({ whole_archive_deps = select({
"//build/bazel/platforms/arch:arm64": [":static_dep2"], "//build/bazel/platforms/arch:arm64": [":static_dep2"],
"//conditions:default": [], "//conditions:default": [],
@@ -480,7 +472,6 @@ cc_library_static {
"//build/bazel/platforms/os:android": [":static_dep"], "//build/bazel/platforms/os:android": [":static_dep"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
whole_archive_deps = select({ whole_archive_deps = select({
"//build/bazel/platforms/os:android": [":static_dep2"], "//build/bazel/platforms/os:android": [":static_dep2"],
"//conditions:default": [], "//conditions:default": [],
@@ -530,7 +521,6 @@ cc_library_static {
"//build/bazel/platforms/os:android": [":static_dep3"], "//build/bazel/platforms/os:android": [":static_dep3"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
whole_archive_deps = [":static_dep2"], whole_archive_deps = [":static_dep2"],
)`}, )`},
}) })
@@ -556,7 +546,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = [ srcs_c = [
"common.c", "common.c",
"foo-a.c", "foo-a.c",
@@ -584,7 +573,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": ["foo-arm.c"], "//build/bazel/platforms/arch:arm": ["foo-arm.c"],
"//conditions:default": [], "//conditions:default": [],
@@ -617,7 +605,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": ["for-arm.c"], "//build/bazel/platforms/arch:arm": ["for-arm.c"],
"//conditions:default": ["not-for-arm.c"], "//conditions:default": ["not-for-arm.c"],
@@ -652,7 +639,6 @@ cc_library_static {
} `, } `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": [
"for-arm.c", "for-arm.c",
@@ -703,7 +689,6 @@ cc_library_static {
} `, } `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": [
"for-arm.c", "for-arm.c",
@@ -763,7 +748,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs = ["common.cc"] + select({ srcs = ["common.cc"] + select({
"//build/bazel/platforms/arch:arm": [], "//build/bazel/platforms/arch:arm": [],
"//conditions:default": ["foo-no-arm.cc"], "//conditions:default": ["foo-no-arm.cc"],
@@ -797,7 +781,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs = ["common.cc"] + select({ srcs = ["common.cc"] + select({
"//build/bazel/platforms/arch:arm": [], "//build/bazel/platforms/arch:arm": [],
"//build/bazel/platforms/arch:x86": [ "//build/bazel/platforms/arch:x86": [
@@ -830,7 +813,6 @@ cc_library_static {
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
implementation_deps = [":static_dep"], implementation_deps = [":static_dep"],
linkstatic = True,
)`}, )`},
}) })
} }
@@ -857,7 +839,6 @@ cc_library_static {
} `, } `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": ["for-lib32.c"], "//build/bazel/platforms/arch:arm": ["for-lib32.c"],
"//build/bazel/platforms/arch:x86": ["for-lib32.c"], "//build/bazel/platforms/arch:x86": ["for-lib32.c"],
@@ -892,7 +873,6 @@ cc_library_static {
} `, } `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static2", name = "foo_static2",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": [
"for-lib32.c", "for-lib32.c",
@@ -960,7 +940,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static3", name = "foo_static3",
linkstatic = True,
srcs_c = ["common.c"] + select({ srcs_c = ["common.c"] + select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": [
"for-arm.c", "for-arm.c",
@@ -1075,7 +1054,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static3", name = "foo_static3",
linkstatic = True,
srcs = [ srcs = [
"//dep:generated_hdr_other_pkg", "//dep:generated_hdr_other_pkg",
"//dep:generated_src_other_pkg", "//dep:generated_src_other_pkg",
@@ -1131,7 +1109,6 @@ cc_library_static {
}`, }`,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "foo_static", name = "foo_static",
linkstatic = True,
srcs_c = select({ srcs_c = select({
"//build/bazel/platforms/os:android": ["android_src.c"], "//build/bazel/platforms/os:android": ["android_src.c"],
"//conditions:default": [], "//conditions:default": [],
@@ -1183,7 +1160,6 @@ cc_library_static {
"//build/bazel/product_variables:malloc_zero_contents": ["-Wmalloc_zero_contents"], "//build/bazel/product_variables:malloc_zero_contents": ["-Wmalloc_zero_contents"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
srcs_c = ["common.c"], srcs_c = ["common.c"],
)`}, )`},
}) })
@@ -1252,7 +1228,6 @@ cc_library_static {
"//build/bazel/product_variables:malloc_not_svelte-x86": ["-Wlib32_malloc_not_svelte"], "//build/bazel/product_variables:malloc_not_svelte-x86": ["-Wlib32_malloc_not_svelte"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
srcs_c = ["common.c"], srcs_c = ["common.c"],
)`}, )`},
}) })
@@ -1282,7 +1257,6 @@ cc_library_static {
"//build/bazel/product_variables:platform_sdk_version": ["-DPLATFORM_SDK_VERSION=$(Platform_sdk_version)"], "//build/bazel/product_variables:platform_sdk_version": ["-DPLATFORM_SDK_VERSION=$(Platform_sdk_version)"],
"//conditions:default": [], "//conditions:default": [],
}), }),
linkstatic = True,
srcs_as = ["common.S"], srcs_as = ["common.S"],
)`}, )`},
}) })
@@ -1303,7 +1277,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "root_empty", name = "root_empty",
linkstatic = True,
system_dynamic_deps = [], system_dynamic_deps = [],
)`}, )`},
}) })
@@ -1330,7 +1303,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "static_empty", name = "static_empty",
linkstatic = True,
system_dynamic_deps = [], system_dynamic_deps = [],
)`}, )`},
}) })
@@ -1355,7 +1327,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "target_bionic_empty", name = "target_bionic_empty",
linkstatic = True,
system_dynamic_deps = [], system_dynamic_deps = [],
)`}, )`},
}) })
@@ -1384,7 +1355,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "target_linux_bionic_empty", name = "target_linux_bionic_empty",
linkstatic = True,
system_dynamic_deps = [], system_dynamic_deps = [],
)`}, )`},
}) })
@@ -1411,7 +1381,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "target_bionic", name = "target_bionic",
linkstatic = True,
system_dynamic_deps = select({ system_dynamic_deps = select({
"//build/bazel/platforms/os:bionic": [":libc"], "//build/bazel/platforms/os:bionic": [":libc"],
"//conditions:default": [], "//conditions:default": [],
@@ -1443,7 +1412,6 @@ cc_library_static {
`, `,
expectedBazelTargets: []string{`cc_library_static( expectedBazelTargets: []string{`cc_library_static(
name = "target_linux_bionic", name = "target_linux_bionic",
linkstatic = True,
system_dynamic_deps = [":libc"] + select({ system_dynamic_deps = [":libc"] + select({
"//build/bazel/platforms/os:linux_bionic": [":libm"], "//build/bazel/platforms/os:linux_bionic": [":libm"],
"//conditions:default": [], "//conditions:default": [],

1
cc/library.go
View File

@@ -2332,7 +2332,6 @@ type bazelCcLibraryStaticAttributes struct {
Dynamic_deps bazel.LabelListAttribute Dynamic_deps bazel.LabelListAttribute
System_dynamic_deps bazel.LabelListAttribute System_dynamic_deps bazel.LabelListAttribute
Linkopts bazel.StringListAttribute Linkopts bazel.StringListAttribute
Linkstatic bool
Use_libcrt bazel.BoolAttribute Use_libcrt bazel.BoolAttribute
Rtti bazel.BoolAttribute Rtti bazel.BoolAttribute
Export_includes bazel.StringListAttribute Export_includes bazel.StringListAttribute