Call InitBerberis() for all testsHEADmastermain

Test: builds, treehugger
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f8025548ac776ebaa91ba68fe088b217fcbd379d)
Merged-In: I8af59af5f9681e76e8adfbe7d1115c6614fb07e7
Change-Id: I8af59af5f9681e76e8adfbe7d1115c6614fb07e7

4 files changed, 38 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 7b81b549..610acff8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -238,6 +238,7 @@ cc_test_host {
                 "libberberis_code_gen_lib_riscv64",
             ],
             whole_static_libs: [
+                "libberberis_tests_main",
                 "libberberis_backend_riscv64_to_x86_64_unit_tests",
                 "libberberis_code_gen_lib_riscv64_unit_tests",
                 "libberberis_guest_abi_riscv64_unit_tests",
diff --git a/guest_os_primitives/Android.bp b/guest_os_primitives/Android.bp
index e6639385..91ce642e 100644
--- a/guest_os_primitives/Android.bp
+++ b/guest_os_primitives/Android.bp
@@ -187,6 +187,7 @@ cc_defaults {
         "libberberis_base_headers",
         "libberberis_guest_os_primitives_headers",
         "libberberis_guest_state_headers",
+        "libberberis_runtime_headers",
     ],
 }
 
diff --git a/test_utils/Android.bp b/test_utils/Android.bp
index 96120c0b..64f189a2 100644
--- a/test_utils/Android.bp
+++ b/test_utils/Android.bp
@@ -33,3 +33,14 @@ cc_library_headers {
         "libberberis_runtime_primitives_headers",
     ],
 }
+
+cc_test_library {
+    name: "libberberis_tests_main",
+    defaults: ["berberis_test_library_defaults"],
+    host_supported: true,
+    header_libs: [
+        "berberis_test_utils_headers",
+        "libberberis_runtime_headers",
+    ],
+    srcs: ["tests_main.cc"],
+}
diff --git a/test_utils/tests_main.cc b/test_utils/tests_main.cc
new file mode 100644
index 00000000..f8a2e42f
--- /dev/null
+++ b/test_utils/tests_main.cc
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+
+#include "berberis/runtime/berberis.h"
+
+int main(int argc, char** argv) {
+  testing::InitGoogleTest(&argc, argv);
+  berberis::InitBerberis();
+  return RUN_ALL_TESTS();
+}