diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-24 11:16:24 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-24 11:16:24 +0100 |
| commit | 0ad2a671ad337bf738f618f8655c0fb930c3a58b (patch) | |
| tree | 75fb490a332817133ab4fd6dc2216dec43249a66 /chromium/tools | |
| parent | 3018e5c2155630f434529d28e0aa08c95d0a1ffd (diff) | |
| download | android_frameworks_webview-0ad2a671ad337bf738f618f8655c0fb930c3a58b.tar.gz android_frameworks_webview-0ad2a671ad337bf738f618f8655c0fb930c3a58b.tar.bz2 android_frameworks_webview-0ad2a671ad337bf738f618f8655c0fb930c3a58b.zip | |
Update merge project list for new skia.
Skia now just has a single DEPS entry instead of three; update project
list.
Change-Id: Ia09647279d09ec622d174ce710656223a1b2fb7d
Diffstat (limited to 'chromium/tools')
| -rw-r--r-- | chromium/tools/merge_common.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/tools/merge_common.py b/chromium/tools/merge_common.py index 02293f6..1e404c7 100644 --- a/chromium/tools/merge_common.py +++ b/chromium/tools/merge_common.py @@ -54,9 +54,7 @@ THIRD_PARTY_PROJECTS_WITH_FULL_HISTORY = [ 'third_party/opus/src', 'third_party/ots', 'third_party/sfntly/cpp/src', - 'third_party/skia/include', - 'third_party/skia/gyp', - 'third_party/skia/src', + 'third_party/skia', 'third_party/smhasher/src', 'third_party/usrsctp/usrsctplib', 'third_party/webrtc', |