external/boringssl: Sync to 6d50f475e319de153a43e1dba5a1beca95948c63.

This includes the following changes:

https://boringssl.googlesource.com/boringssl/+log/0726fb76ebe7f422e3c4fb2e25a0064926975770..6d50f475e319de153a43e1dba5a1beca95948c63

This also updates the build files to add the new GTest-based targets and
work with the C++ file in libssl.

Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a

Change-Id: I99718d51c901fe2e2e1e0398fc61fe1e76ccdb3f

1 files changed, 21 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index d120abf0..f0187da3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,7 +32,7 @@ cc_defaults {
 
     local_include_dirs: ["src/include"],
     export_include_dirs: ["src/include"],
-    stl: "none",
+    stl: "libc++_static",
     sdk_version: "9",
 
     cflags: ["-DBORINGSSL_ANDROID_SYSTEM"],
@@ -209,3 +209,23 @@ cc_test {
         "libssl",
     ],
 }
+
+cc_test {
+  name: "boringssl_crypto_test",
+  host_supported: true,
+  defaults: ["boringssl_crypto_test_sources", "boringssl_flags"],
+  whole_static_libs: ["boringssl_test_support"],
+
+  cflags: ["-DBORINGSSL_ANDROID_SYSTEM"],
+  shared_libs: ["libcrypto"],
+}
+
+cc_test {
+  name: "boringssl_ssl_test",
+  host_supported: true,
+  defaults: ["boringssl_ssl_test_sources", "boringssl_flags"],
+  whole_static_libs: ["boringssl_test_support"],
+
+  cflags: ["-DBORINGSSL_ANDROID_SYSTEM"],
+  shared_libs: ["libcrypto", "libssl"],
+}