diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-07-31 11:30:01 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-07-31 11:30:01 +0100 |
| commit | 70bf4c997ea13320710f74e098d943e1d0f3fdda (patch) | |
| tree | 6a074f2616c20882a72bbbe2b59e5d99db7bf93b /chromium/tools | |
| parent | 5097893bd11146baf8822d7b422f407f8e7b9624 (diff) | |
| download | android_frameworks_webview-70bf4c997ea13320710f74e098d943e1d0f3fdda.tar.gz android_frameworks_webview-70bf4c997ea13320710f74e098d943e1d0f3fdda.tar.bz2 android_frameworks_webview-70bf4c997ea13320710f74e098d943e1d0f3fdda.zip | |
Remove libjingle from the project list.
libjingle has moved upstream; stop merging it for now until we've
created the new project (or removed this dependency).
This reverts commit a20a107b5f4470d7fe1a483a493729220e8ba216.
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 52f4ee8..46ece78 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -42,7 +42,6 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'third_party/freetype', 'third_party/icu', 'third_party/leveldatabase/src', - 'third_party/libjingle/source', 'third_party/libphonenumber/src/phonenumbers', 'third_party/libphonenumber/src/resources', 'third_party/mesa/src', |