commit 0c61efe6da4dd29556e9d2bf7321d2f9283a4e13
author Pete Bentley <prb@google.com> Tue Aug 13 09:32:23 2019 +0100
committer Pete Bentley <prb@google.com> Tue Aug 13 10:27:15 2019 +0100
tree 207a60c135efaef5dfec5f7b3343034555943fc0
parent dd42a613176ed39d12be02cf21aeae057d9ef6e6

external/boringssl: Sync to bc2a2013e03754a89a701739a7b58c422391efa2.

Third time's the charm.

This includes the following changes:

https://boringssl.googlesource.com/boringssl/+log/c9827e073f64e353c4891ecc2c73721882543ee0..bc2a2013e03754a89a701739a7b58c422391efa2

Test: atest CtsLibcoreTestCases
Test: atest CtsLibcoreOkHttpTestCases
Change-Id: I7943c83d12237ec6e4dc54fb3d5a9cecb909e6e7

Android.bp

diff --git a/Android.bp b/Android.bp
index 8a01f91..b447ce1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -184,25 +184,25 @@
     name: "cavp",
     host_supported: true,
     srcs: [
-        "src/fipstools/cavp_aes_gcm_test.cc",
-        "src/fipstools/cavp_aes_test.cc",
-        "src/fipstools/cavp_ctr_drbg_test.cc",
-        "src/fipstools/cavp_ecdsa2_keypair_test.cc",
-        "src/fipstools/cavp_ecdsa2_pkv_test.cc",
-        "src/fipstools/cavp_ecdsa2_siggen_test.cc",
-        "src/fipstools/cavp_ecdsa2_sigver_test.cc",
-        "src/fipstools/cavp_hmac_test.cc",
-        "src/fipstools/cavp_kas_test.cc",
-        "src/fipstools/cavp_keywrap_test.cc",
-        "src/fipstools/cavp_main.cc",
-        "src/fipstools/cavp_rsa2_keygen_test.cc",
-        "src/fipstools/cavp_rsa2_siggen_test.cc",
-        "src/fipstools/cavp_rsa2_sigver_test.cc",
-        "src/fipstools/cavp_sha_monte_test.cc",
-        "src/fipstools/cavp_sha_test.cc",
-        "src/fipstools/cavp_tdes_test.cc",
-        "src/fipstools/cavp_test_util.cc",
-        "src/fipstools/cavp_tlskdf_test.cc",
+        "src/util/fipstools/cavp/cavp_aes_gcm_test.cc",
+        "src/util/fipstools/cavp/cavp_aes_test.cc",
+        "src/util/fipstools/cavp/cavp_ctr_drbg_test.cc",
+        "src/util/fipstools/cavp/cavp_ecdsa2_keypair_test.cc",
+        "src/util/fipstools/cavp/cavp_ecdsa2_pkv_test.cc",
+        "src/util/fipstools/cavp/cavp_ecdsa2_siggen_test.cc",
+        "src/util/fipstools/cavp/cavp_ecdsa2_sigver_test.cc",
+        "src/util/fipstools/cavp/cavp_hmac_test.cc",
+        "src/util/fipstools/cavp/cavp_kas_test.cc",
+        "src/util/fipstools/cavp/cavp_keywrap_test.cc",
+        "src/util/fipstools/cavp/cavp_main.cc",
+        "src/util/fipstools/cavp/cavp_rsa2_keygen_test.cc",
+        "src/util/fipstools/cavp/cavp_rsa2_siggen_test.cc",
+        "src/util/fipstools/cavp/cavp_rsa2_sigver_test.cc",
+        "src/util/fipstools/cavp/cavp_sha_monte_test.cc",
+        "src/util/fipstools/cavp/cavp_sha_test.cc",
+        "src/util/fipstools/cavp/cavp_tdes_test.cc",
+        "src/util/fipstools/cavp/cavp_test_util.cc",
+        "src/util/fipstools/cavp/cavp_tlskdf_test.cc",
     ],
 
     shared_libs: [