diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 02:02:04 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 02:02:04 +0000 |
| commit | a87770f81eeba492991165e6473ac3451751ae18 (patch) | |
| tree | 54e066b8e299f4804c30dad9ea7d69422037fb55 /android_webview | |
| parent | ecd458e5ca3d846af37660799e353e6607ba5774 (diff) | |
| download | chromium_src-a87770f81eeba492991165e6473ac3451751ae18.zip chromium_src-a87770f81eeba492991165e6473ac3451751ae18.tar.gz chromium_src-a87770f81eeba492991165e6473ac3451751ae18.tar.bz2 | |
Revert 272672 "Attempt #4: Change Skia DEPS to pull from googles..."
Waterfall Builder: iOS Simulator (dbg) is failing in bot_update since
http://build.chromium.org/p/chromium.mac/builders/iOS%20Simulator%20%28dbg%29/builds/16396
Suspecting this. Will unrevert if not.
BUG=377342
> Attempt #4: Change Skia DEPS to pull from googlesource (git)
>
> - Uploading from pure-svn and intending to commit manually to properly remove the directory from svn.
> - Includes deps_whitelist change for new Skia DEP
> - Attempt #3 failed due to Poppler license issue. This was resolved in https://skia.googlesource.com/skia/+/3056bdd2364fe1aa68f4ec7b0fe07740c3e8d123
>
> R=mkosiba@chromium.org
>
> Review URL: https://codereview.chromium.org/296903004
TBR=borenet@google.com
Review URL: https://codereview.chromium.org/297303002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rwxr-xr-x | android_webview/buildbot/deps_whitelist.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android_webview/buildbot/deps_whitelist.py b/android_webview/buildbot/deps_whitelist.py index 6d606f4..6b8470c 100755 --- a/android_webview/buildbot/deps_whitelist.py +++ b/android_webview/buildbot/deps_whitelist.py @@ -53,7 +53,9 @@ class DepsWhitelist(object): 'third_party/opus/src', 'third_party/ots', 'third_party/sfntly/cpp/src', - 'third_party/skia', + 'third_party/skia/gyp', + 'third_party/skia/include', + 'third_party/skia/src', 'third_party/smhasher/src', 'third_party/usrsctp/usrsctplib', 'third_party/webrtc', |