generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove dependency on openssl for android, add dependency on boringssl. Should make Android bots green again.

Browse Source 
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
This commit is contained in:
solenberg@webrtc.org 2014-07-29 15:23:59 +00:00
parent fdbe1442c5
commit fc8b0871d9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -55,6 +55,7 @@
/third_party/android_tools /third_party/android_tools
/third_party/asan /third_party/asan
/third_party/binutils /third_party/binutils
/third_party/boringssl
/third_party/build_gn /third_party/build_gn
/third_party/BUILD.gn /third_party/BUILD.gn
/third_party/clang_format /third_party/clang_format

4
DEPS
View File

@ -230,8 +230,8 @@ deps_os = {
"third_party/WebKit/Tools/Scripts": "third_party/WebKit/Tools/Scripts":
Var("webkit_trunk") + "/Tools/Scripts@151677", Var("webkit_trunk") + "/Tools/Scripts@151677",
"third_party/openssl": "third_party/boringssl":
From("chromium_deps", "src/third_party/openssl"), Var("chromium_trunk") + "/src/third_party/boringssl@" + Var("chromium_revision"),
}, },
} }