commit a5568dd02cce22df602ec1d5d363e8f4458e1f1e
author Pete Bentley <prb@google.com> Wed Sep 30 02:17:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 30 02:17:24 2020 +0000
tree cd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parent f14061de3e0d2a9d46e5a78f7f5a8a7b5a517f81
parent de1d978900042816aeccee9bf70271e9d8f4f365

Explicitly disable SM3 hash and SM4 cipher. am: 4c66023a25 am: 441ff76781 am: 974a8b5922 am: de1d978900

Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1441338

Change-Id: Ie313a85ea0930f36db72d096ef5edf328ce5ed5e

Android.bp

diff --git a/Android.bp b/Android.bp
index caf246f..e28d37b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,11 @@
         "-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",