tag 511b27017596be7979e53493a78d12245f401591
tagger The Android Open Source Project <initial-contribution@android.com> Thu Feb 02 12:37:54 2017 -0800
object 75d906616f5a32a13f6b7c2e53e11a8cd7c123c7

Android 7.0.0 Release 29 (NBD91Z)

commit 75d906616f5a32a13f6b7c2e53e11a8cd7c123c7
author David Benjamin <davidben@chromium.org> Tue Jan 26 01:09:19 2016 -0500
committer gitbuildkicker <android-build@google.com> Thu Oct 27 15:18:42 2016 -0700
tree b5d46690440a5a3b3718e43fc0c64b7cf450e548
parent a55f9ec2a30666dc1c834b12ae0d77d8989a84ef

DO NOT MERGE: Add a few more no-op stubs for cURL compatibility.

With these stubs, cURL should not need any BoringSSL #ifdefs at all,
except for their OCSP #ifdefs (which can switch to the more generally
useful OPENSSL_NO_OCSP) and the workaround for wincrypt.h macro
collisions. That we intentionally leave to the consumer rather than add
a partial hack that makes the build sensitive to include order.

(I'll send them a patch upstream once this cycles in.)

Reviewed-on: https://boringssl-review.googlesource.com/6980
Reviewed-by: Adam Langley <agl@google.com>

(cherry picked from upstream commit e5aa791a1cbd70c64a5cadaae71eda8f6d5aa992)

Change-Id: I65812be5cb37acd63d755b313162b7a03d130d98
(cherry picked from commit 4177c9b4819e83225ee33b0b92cf9db6b8401850)