summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2016-08-11 13:26:41 -0400
committerDavid Benjamin <davidben@google.com>2016-09-12 13:10:03 -0400
commitf0c4a6c4bbde5229ceb86740703243fe5c436aad (patch)
treef55d7d9db657ca3a8a09c2ae5017a40ad92b15cb /Android.bp
parentc501d144b4305c228a0aaa8b3e291510e3b1235b (diff)
downloadboringssl-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.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 98b2eee7..f9223023 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",