From d205728a7533a7a955273e605e038f230d46569f Mon Sep 17 00:00:00 2001 From: "tapted@chromium.org" Date: Mon, 26 May 2014 02:31:46 +0000 Subject: Revert 272769 "Revert 272672 "Attempt #4: Change Skia DEPS to pu..." Still failing - will need infra to take a look. > 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 TBR=tapted@chromium.org Review URL: https://codereview.chromium.org/297313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272771 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/buildbot/deps_whitelist.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'android_webview') diff --git a/android_webview/buildbot/deps_whitelist.py b/android_webview/buildbot/deps_whitelist.py index 6b8470c..6d606f4 100755 --- a/android_webview/buildbot/deps_whitelist.py +++ b/android_webview/buildbot/deps_whitelist.py @@ -53,9 +53,7 @@ class DepsWhitelist(object): 'third_party/opus/src', 'third_party/ots', 'third_party/sfntly/cpp/src', - 'third_party/skia/gyp', - 'third_party/skia/include', - 'third_party/skia/src', + 'third_party/skia', 'third_party/smhasher/src', 'third_party/usrsctp/usrsctplib', 'third_party/webrtc', -- cgit v1.1