Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now."
diff --git a/android/bazel.go b/android/bazel.go
index 26d70e4..32963b3 100644
--- a/android/bazel.go
+++ b/android/bazel.go
@@ -200,6 +200,7 @@
 	bp2buildDefaultConfig = Bp2BuildConfig{
 		"bionic":                                             Bp2BuildDefaultTrueRecursively,
 		"build/bazel/examples/apex/minimal":                  Bp2BuildDefaultTrueRecursively,
+		"build/soong/cc/libbuildversion":                     Bp2BuildDefaultTrue, // Skip tests subdir
 		"development/sdk":                                    Bp2BuildDefaultTrueRecursively,
 		"external/arm-optimized-routines":                    Bp2BuildDefaultTrueRecursively,
 		"external/boringssl":                                 Bp2BuildDefaultTrueRecursively,