summaryrefslogtreecommitdiffstats
path: root/chromium/tools
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-08-27 11:13:28 +0100
committerTorne (Richard Coles) <torne@google.com>2014-08-27 11:13:28 +0100
commit835aeb90a376699f177d2da20ab83387b578ebc6 (patch)
tree0bfdad7108122bec1d884f8285dd5b3627df1361 /chromium/tools
parent753233e1666d4a8f69a4fae4345f9590f19589ef (diff)
downloadandroid_frameworks_webview-835aeb90a376699f177d2da20ab83387b578ebc6.tar.gz
android_frameworks_webview-835aeb90a376699f177d2da20ab83387b578ebc6.tar.bz2
android_frameworks_webview-835aeb90a376699f177d2da20ab83387b578ebc6.zip
Remove openssl from merged projects list.
OpenSSL has been replaced by boringssl upstream and no longer exists in DEPS. Change-Id: Idb3ad563ead2a48b98196359a65bde9fa52da90e
Diffstat (limited to 'chromium/tools')
-rw-r--r--chromium/tools/merge_common.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py
index abe9412..4e58404 100644
--- a/chromium/tools/merge_common.py
+++ b/chromium/tools/merge_common.py
@@ -52,7 +52,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [
'third_party/libyuv',
'third_party/mesa/src',
'third_party/openmax_dl',
- 'third_party/openssl',
'third_party/opus/src',
'third_party/ots',
'third_party/sfntly/cpp/src',