diff options
author | David Benjamin <davidben@google.com> | 2016-08-11 13:26:41 -0400 |
---|---|---|
committer | David Benjamin <davidben@google.com> | 2016-09-12 13:10:03 -0400 |
commit | f0c4a6c4bbde5229ceb86740703243fe5c436aad (patch) | |
tree | f55d7d9db657ca3a8a09c2ae5017a40ad92b15cb /Android.bp | |
parent | c501d144b4305c228a0aaa8b3e291510e3b1235b (diff) | |
download | boringssl-f0c4a6c4bbde5229ceb86740703243fe5c436aad.tar.gz |
external/boringssl: Sync to 0e9138d2.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/aa24851515d6280aa1d6a8b1548fe74691df3136..0e9138d295cd556e830dc8b3be735e808680f4bd
This requires some build tweaks:
- trusty's rules.mk builds with BORINGSSL_NO_CXX to suppress the new C++
scopers since they build their version of keymaster without the STL.
- BORINGSSL_ENABLE_RC4_TLS to temporarily keep RC4 in the TLS stack.
Change-Id: Ic688ec5779f649a4912b00fb2b55cba64fb07449
Diffstat (limited to 'Android.bp')
-rw-r--r-- | Android.bp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -13,6 +13,8 @@ cc_defaults { "-fvisibility=hidden", "-DBORINGSSL_SHARED_LIBRARY", "-DBORINGSSL_IMPLEMENTATION", + // TODO(davidben): Remove this once RC4 is no longer needed in Android. + "-DBORINGSSL_ENABLE_RC4_TLS", "-DOPENSSL_SMALL", "-D_XOPEN_SOURCE=700", "-Wno-unused-parameter", |