bp2build: refactor/standardize cc_* bp2build converters
This CL refactors the cc* bp2build converters to use the common
attribute extractors in cc/bp2build.go.
This also adds include_build_directory to be handled by the compiler
attr extractor to generate recursive headers as inputs.
This also turns include_dirs and local_include_dirs into the
execroot-relative -I flags.
e.g. if a module in bionic/libc has "private" in local_include_dirs,
the "-Ibionic/libc/private" copt is generated for it.
Fixes: 185139955
Test: TH
Test: Forrest for mixed_clean-droid
Change-Id: Ib67056482227e62068fbbea0455035bdf5d56319
diff --git a/bp2build/cc_library_headers_conversion_test.go b/bp2build/cc_library_headers_conversion_test.go
index c59241f..3180267 100644
--- a/bp2build/cc_library_headers_conversion_test.go
+++ b/bp2build/cc_library_headers_conversion_test.go
@@ -131,6 +131,7 @@
}`,
expectedBazelTargets: []string{`cc_library_headers(
name = "foo_headers",
+ copts = ["-I."],
deps = [
":lib-1",
":lib-2",
@@ -157,6 +158,7 @@
}),
)`, `cc_library_headers(
name = "lib-1",
+ copts = ["-I."],
hdrs = [
"lib-1/lib1a.h",
"lib-1/lib1b.h",
@@ -164,6 +166,7 @@
includes = ["lib-1"],
)`, `cc_library_headers(
name = "lib-2",
+ copts = ["-I."],
hdrs = [
"lib-2/lib2a.h",
"lib-2/lib2b.h",
@@ -201,12 +204,16 @@
}`,
expectedBazelTargets: []string{`cc_library_headers(
name = "android-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "base-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "darwin-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "foo_headers",
+ copts = ["-I."],
deps = [":base-lib"] + select({
"//build/bazel/platforms/os:android": [":android-lib"],
"//build/bazel/platforms/os:darwin": [":darwin-lib"],
@@ -218,12 +225,16 @@
}),
)`, `cc_library_headers(
name = "fuchsia-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "linux-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "linux_bionic-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "windows-lib",
+ copts = ["-I."],
)`},
},
{
@@ -244,10 +255,13 @@
}`,
expectedBazelTargets: []string{`cc_library_headers(
name = "android-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "exported-lib",
+ copts = ["-I."],
)`, `cc_library_headers(
name = "foo_headers",
+ copts = ["-I."],
deps = select({
"//build/bazel/platforms/os:android": [
":android-lib",