Snap for 10453563 from 0c7011fa73af62ba1ff8f5107e6b56ea8a2be8f1 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: Ic41c89871520cc9c0e225de256815b66601e3da6

1 files changed, 7 insertions, 0 deletions

diff --git a/googlemock/Android.bp b/googlemock/Android.bp
index 40473d43..77cf6501 100644
--- a/googlemock/Android.bp
+++ b/googlemock/Android.bp
@@ -34,6 +34,9 @@ cc_defaults {
         "-Wno-missing-field-initializers",
         "-Wno-sign-compare",
         "-Wno-unused-parameter",
+        // We need to generate exception tables, otherwise any users of this
+        // library that use testing::Throw will trigger undefined behaviour.
+        "-fexceptions",
     ],
 }
 
@@ -87,6 +90,8 @@ cc_library_static {
     rtti: true,
     static_libs: ["libgtest"],
     vendor_available: true,
+    product_available: true,
+    native_bridge_supported: true,
 }
 
 cc_library_static {
@@ -98,6 +103,8 @@ cc_library_static {
     srcs: ["src/gmock_main.cc"],
     static_libs: ["libgtest"],
     vendor_available: true,
+    product_available: true,
+    native_bridge_supported: true,
 }
 
 // Deprecated: use libgmock instead