commit 9912bfae0a324a3a681d73b526fea0a23036be73
author Pete Bentley <prb@google.com> Thu Oct 15 08:50:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 15 08:50:10 2020 +0000
tree 4a01a662a3dd27b314a3aad3e75da15e37eb7d96
parent 267976c7ef3a1d15c2bf560526be795d1a2725e7
parent b9411834e9d046eadde7eb5d2d874fc727f29449

Merge "Revert "Explicitly disable SM3 hash and SM4 cipher.""

Android.bp

diff --git a/Android.bp b/Android.bp
index e28d37b..caf246f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,11 +32,6 @@
         "-DMAX_SYM_DATA=256",
         "-DDEBUG=YES",
         "-DALG_CAMELLIA=ALG_NO",
-        // BoringSSL does not support SM3 or SM4
-        // TODO(prb): remove once https://boringssl-review.googlesource.com/c/boringssl/+/43104
-        // lands in AOSP.
-        "-DOPENSSL_NO_SM3",
-        "-DOPENSSL_NO_SM4",
         "-Wno-logical-op-parentheses",
         "-Wno-empty-body",
         "-Wno-missing-field-initializers",