Merge "Add libgoogle-benchmark-main module." am: fedc32dd69 am: 33355bcdca am: 9222acf163 am: 3f199de82c

Original change: https://android-review.googlesource.com/c/platform/external/google-benchmark/+/1423810

Change-Id: I8626677109fb86b4c40f3dea79e996ef13748d4d

1 files changed, 18 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index e886e1c..88fe433 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-cc_library_static {
-    name: "libgoogle-benchmark",
+cc_defaults {
+    name: "libgoogle-benchmark-defaults",
     host_supported: true,
     local_include_dirs: ["include"],
     vendor_available: true,
@@ -25,16 +25,28 @@ cc_library_static {
         "-Werror",
         "-Wno-deprecated-declarations",
     ],
-
-    exclude_srcs: [
-        "src/benchmark_main.cc",
-    ],
     srcs: [
         "src/*.cc",
     ],
     export_include_dirs: ["include"],
 }
 
+// For benchmarks that define their own main().
+cc_library_static {
+    name: "libgoogle-benchmark",
+    defaults: ["libgoogle-benchmark-defaults"],
+    exclude_srcs: [
+        "src/benchmark_main.cc",
+    ],
+}
+
+// For benchmarks that want to use the default main().
+// Make sure this dependency is in the whole_static_libs attribute.
+cc_library_static {
+    name: "libgoogle-benchmark-main",
+    defaults: ["libgoogle-benchmark-defaults"],
+}
+
 cc_test {
     name: "google-benchmark-test",
     srcs: ["test/basic_test.cc"],