bp2build: remove header globs in generated srcs.
Not needed anymore for bp2build-incremental since https://android-review.googlesource.com/q/topic:no-include-check.
Not needed for mixed builds either, since cc compile actions aren't sandboxed.
Fixes: 186488830
Test: treehugger and go tests
Change-Id: Ib5d4908dcce6bf910a653c457bb251d726e717d4
diff --git a/bp2build/cc_library_static_conversion_test.go b/bp2build/cc_library_static_conversion_test.go
index 00325fb..207a080 100644
--- a/bp2build/cc_library_static_conversion_test.go
+++ b/bp2build/cc_library_static_conversion_test.go
@@ -192,12 +192,6 @@
":whole_static_lib_1",
":whole_static_lib_2",
],
- hdrs = [
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- ],
includes = [
"export_include_dir_1",
"export_include_dir_2",
@@ -206,105 +200,27 @@
srcs = [
"foo_static1.cc",
"foo_static2.cc",
- "implicit_include_1.h",
- "implicit_include_2.h",
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- "include_dir_1/include_dir_1_a.h",
- "include_dir_1/include_dir_1_b.h",
- "include_dir_2/include_dir_2_a.h",
- "include_dir_2/include_dir_2_b.h",
- "local_include_dir_1/local_include_dir_1_a.h",
- "local_include_dir_1/local_include_dir_1_b.h",
- "local_include_dir_2/local_include_dir_2_a.h",
- "local_include_dir_2/local_include_dir_2_b.h",
],
)`, `cc_library_static(
name = "static_lib_1",
copts = ["-I."],
linkstatic = True,
- srcs = [
- "static_lib_1.cc",
- "implicit_include_1.h",
- "implicit_include_2.h",
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- "include_dir_1/include_dir_1_a.h",
- "include_dir_1/include_dir_1_b.h",
- "include_dir_2/include_dir_2_a.h",
- "include_dir_2/include_dir_2_b.h",
- "local_include_dir_1/local_include_dir_1_a.h",
- "local_include_dir_1/local_include_dir_1_b.h",
- "local_include_dir_2/local_include_dir_2_a.h",
- "local_include_dir_2/local_include_dir_2_b.h",
- ],
+ srcs = ["static_lib_1.cc"],
)`, `cc_library_static(
name = "static_lib_2",
copts = ["-I."],
linkstatic = True,
- srcs = [
- "static_lib_2.cc",
- "implicit_include_1.h",
- "implicit_include_2.h",
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- "include_dir_1/include_dir_1_a.h",
- "include_dir_1/include_dir_1_b.h",
- "include_dir_2/include_dir_2_a.h",
- "include_dir_2/include_dir_2_b.h",
- "local_include_dir_1/local_include_dir_1_a.h",
- "local_include_dir_1/local_include_dir_1_b.h",
- "local_include_dir_2/local_include_dir_2_a.h",
- "local_include_dir_2/local_include_dir_2_b.h",
- ],
+ srcs = ["static_lib_2.cc"],
)`, `cc_library_static(
name = "whole_static_lib_1",
copts = ["-I."],
linkstatic = True,
- srcs = [
- "whole_static_lib_1.cc",
- "implicit_include_1.h",
- "implicit_include_2.h",
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- "include_dir_1/include_dir_1_a.h",
- "include_dir_1/include_dir_1_b.h",
- "include_dir_2/include_dir_2_a.h",
- "include_dir_2/include_dir_2_b.h",
- "local_include_dir_1/local_include_dir_1_a.h",
- "local_include_dir_1/local_include_dir_1_b.h",
- "local_include_dir_2/local_include_dir_2_a.h",
- "local_include_dir_2/local_include_dir_2_b.h",
- ],
+ srcs = ["whole_static_lib_1.cc"],
)`, `cc_library_static(
name = "whole_static_lib_2",
copts = ["-I."],
linkstatic = True,
- srcs = [
- "whole_static_lib_2.cc",
- "implicit_include_1.h",
- "implicit_include_2.h",
- "export_include_dir_1/export_include_dir_1_a.h",
- "export_include_dir_1/export_include_dir_1_b.h",
- "export_include_dir_2/export_include_dir_2_a.h",
- "export_include_dir_2/export_include_dir_2_b.h",
- "include_dir_1/include_dir_1_a.h",
- "include_dir_1/include_dir_1_b.h",
- "include_dir_2/include_dir_2_a.h",
- "include_dir_2/include_dir_2_b.h",
- "local_include_dir_1/local_include_dir_1_a.h",
- "local_include_dir_1/local_include_dir_1_b.h",
- "local_include_dir_2/local_include_dir_2_a.h",
- "local_include_dir_2/local_include_dir_2_b.h",
- ],
+ srcs = ["whole_static_lib_2.cc"],
)`},
},
{
@@ -342,14 +258,6 @@
"-I.",
],
linkstatic = True,
- srcs = [
- "//subpackage:subpackage_header.h",
- "//subpackage:subdirectory/subdirectory_header.h",
- "//subpackage/subsubpackage:subsubpackage_header.h",
- "//subpackage/subsubpackage:subdirectory/subdirectory_header.h",
- "//subpackage/subsubpackage/subsubsubpackage:subsubsubpackage_header.h",
- "//subpackage/subsubpackage/subsubsubpackage:subdirectory/subdirectory_header.h",
- ],
)`},
},
{
@@ -371,16 +279,8 @@
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = ["-I."],
- hdrs = [
- "//subpackage:subdirectory/subdirectory_header.h",
- "//subpackage:subpackage_header.h",
- ],
includes = ["subpackage"],
linkstatic = True,
- srcs = [
- "//subpackage:subpackage_header.h",
- "//subpackage:subdirectory/subdirectory_header.h",
- ],
)`},
},
{
@@ -402,16 +302,8 @@
expectedBazelTargets: []string{`cc_library_static(
name = "foo_static",
copts = ["-I."],
- hdrs = [
- "//subpackage:subdirectory/subdirectory_header.h",
- "//subpackage:subpackage_header.h",
- ],
includes = ["subpackage"],
linkstatic = True,
- srcs = [
- "//subpackage:subpackage_header.h",
- "//subpackage:subdirectory/subdirectory_header.h",
- ],
)`},
},
{
@@ -452,14 +344,8 @@
"-Isubpackage/subsubpackage2",
"-Isubpackage",
],
- hdrs = ["exported_subsubpackage/header.h"],
includes = ["./exported_subsubpackage"],
linkstatic = True,
- srcs = [
- "exported_subsubpackage/header.h",
- "subsubpackage/header.h",
- "subsubpackage2/header.h",
- ],
)`},
},
{
@@ -517,11 +403,6 @@
"-I.",
],
linkstatic = True,
- srcs = [
- "//subpackage:subpackage_header.h",
- "//subpackage:subdirectory/subdirectory_header.h",
- "//subpackage2:subpackage2_header.h",
- ],
)`},
},
{