From fc8b0871d9142bb2ca66d4e6ebb278083141e9d3 Mon Sep 17 00:00:00 2001 From: "solenberg@webrtc.org" Date: Tue, 29 Jul 2014 15:23:59 +0000 Subject: [PATCH] Remove dependency on openssl for android, add dependency on boringssl. Should make Android bots green again. TBR=hellner Review URL: https://webrtc-codereview.appspot.com/21079004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6798 4adac7df-926f-26a2-2b94-8c16560cd09d --- .gitignore | 1 + DEPS | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 57808e3b84..90f123ffb1 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ /third_party/android_tools /third_party/asan /third_party/binutils +/third_party/boringssl /third_party/build_gn /third_party/BUILD.gn /third_party/clang_format diff --git a/DEPS b/DEPS index 7b06c0c4c2..499a502959 100644 --- a/DEPS +++ b/DEPS @@ -230,8 +230,8 @@ deps_os = { "third_party/WebKit/Tools/Scripts": Var("webkit_trunk") + "/Tools/Scripts@151677", - "third_party/openssl": - From("chromium_deps", "src/third_party/openssl"), + "third_party/boringssl": + Var("chromium_trunk") + "/src/third_party/boringssl@" + Var("chromium_revision"), }, }