Convert cc_test targets with bp2build.
Starting with libutils_test, adb_test, libcutils_test, (and ~47 other host_supported tests).
Test: $ b build --config=android_x86_64 //system/core/libutils:libutils_test && adb push bazel-bin/system/core/libutils/. /data/tmp/libutils_test_files/ && adb shell /data/tmp/libutils_test_files/libutils_test
Test: presubmits with newly converted cc_test targets
Test: $ b test //system/... --config=linux_x86_64 --verbose_failures --test_output=errors --keep_going --build_tests_only
Fixes: 242038415
Change-Id: I10051aadb880c3aabeba6d7fb079523e6fb4ac43
diff --git a/cc/cc.go b/cc/cc.go
index cded946..0ed9bb6 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3376,6 +3376,15 @@
return false
}
+func (c *Module) testLibrary() bool {
+ if test, ok := c.linker.(interface {
+ testLibrary() bool
+ }); ok {
+ return test.testLibrary()
+ }
+ return false
+}
+
func (c *Module) benchmarkBinary() bool {
if b, ok := c.linker.(interface {
benchmarkBinary() bool
@@ -3654,13 +3663,25 @@
staticLibrary
sharedLibrary
headerLibrary
+ testBin // testBinary already declared
)
func (c *Module) typ() moduleType {
- if c.Binary() {
+ if c.testBinary() {
+ // testBinary is also a binary, so this comes before the c.Binary()
+ // conditional. A testBinary has additional implicit dependencies and
+ // other test-only semantics.
+ return testBin
+ } else if c.Binary() {
return binary
} else if c.Object() {
return object
+ } else if c.testLibrary() {
+ // TODO(b/244431896) properly convert cc_test_library to its own macro. This
+ // will let them add implicit compile deps on gtest, for example.
+ //
+ // For now, treat them as regular shared libraries.
+ return sharedLibrary
} else if c.CcLibrary() {
static := false
shared := false
@@ -3689,7 +3710,11 @@
switch c.typ() {
case binary:
if !prebuilt {
- binaryBp2build(ctx, c, ctx.ModuleType())
+ binaryBp2build(ctx, c)
+ }
+ case testBin:
+ if !prebuilt {
+ testBinaryBp2build(ctx, c)
}
case object:
if !prebuilt {