Merge "cc_cmake_snapshot: fix cc_test and cc_benchmark" into main am: e07a19bc63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107165
Change-Id: I67ae035ef0f008bd5211f6d53543dfb3ab175b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cc/cmake_snapshot.go b/cc/cmake_snapshot.go
index 5712d5e..9ac6350 100644
--- a/cc/cmake_snapshot.go
+++ b/cc/cmake_snapshot.go
@@ -489,16 +489,23 @@
return "library"
case *testBinary:
return "executable"
+ case *benchmarkDecorator:
+ return "executable"
}
- panic(fmt.Sprintf("Unexpected module type: %T", m.compiler))
+ panic(fmt.Sprintf("Unexpected module type: %T", m.linker))
}
func getExtraLibs(m *Module) []string {
switch decorator := m.linker.(type) {
case *testBinary:
if decorator.testDecorator.gtest() {
- return []string{"libgtest"}
+ return []string{
+ "libgtest",
+ "libgtest_main",
+ }
}
+ case *benchmarkDecorator:
+ return []string{"libgoogle-benchmark"}
}
return nil
}