diff options
| author | Pete Bentley <prb@google.com> | 2020-10-15 10:51:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-15 10:51:48 +0000 |
| commit | 9dec4413833a9fc3695620bd36ce565f003b8c1b (patch) | |
| tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
| parent | eb19e81825ec27c211e8218b234f507c08129a5c (diff) | |
| parent | 0ea34057331bb85ae6f032aa5cf012f48590f616 (diff) | |
| download | ms-tpm-20-ref-9dec4413833a9fc3695620bd36ce565f003b8c1b.tar.gz | |
Merge "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 9912bfae0a am: 3a810d657c am: 0627e82f3a am: 0ea3405733
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1458478
Change-Id: Ic790bce0fd05f182fb05144fc912626172e410b2
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -32,11 +32,6 @@ cc_defaults { "-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", |