From c5e53dde7132ea2c48e10fece853349cf6605a0e Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 4 Jul 2014 07:53:46 +0000 Subject: Revert 6597 "Roll chromium_revision 280876:281094" Breaks GN on Linux with errors like this: [133/485 | 4.471] CC obj/third_party/libjpeg_turbo/simd/simd.jsimd_x86_64.o FAILED: g++ -MMD -MF obj/out/Debug/gen/library_loaders/libspeechd.libspeechd.o.d -DCHROMIUM_BUILD -DENABLE_ONE_CLICK_SIGNIN -DENABLE_NOTIFICATIONS -DENABLE_EGLIMAGE=1 -DENABLE_BACKGROUND=1 -DUSE_MOJO=1 -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -DCLD_VERSION=2 -DENABLE_MDNS=1 -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PRINTING=1 -DENABLE_FULL_PRINTING=1 -DENABLE_SPELLCHECK=1 -DUSE_UDEV -DTOOLKIT_VIEWS=1 -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_AURA=1 -DUSE_CAIRO=1 -DUSE_CLIPBOARD_AURAX11=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_GLIB=1 -DUSE_NSS=1 -DUSE_X11=1 -DUSE_XI2_MT=2 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_CONFIGURATION_POLICY -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_REMOTING=1 -DENABLE_GOOGLE_NOW=1 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_GLIBCXX_DEBUG=1 -I../.. -Igen -fno-strict-aliasing -fstack-protector --param=ssp-buffer-size=4 -m64 -funwind-tables -fPIC -pipe -pthread -Wall -Werror -Wsign-compare -Wendif-labels -Wno-missing-field-initializers -Wno-unused-parameter -fvisibility=hidden -O0 -g2 -fno-threadsafe-statics -fvisibility-inlines-hidden -fno-rtti -fno-exceptions -c gen/library_loaders/libspeechd.cc -o obj/out/Debug/gen/library_loaders/libspeechd.libspeechd.o In file included from gen/library_loaders/libspeechd.cc:4:0: ../../out/Debug/gen/library_loaders/libspeechd.h:7:54: fatalerror: third_party/speech-dispatcher/libspeechd.h: No such file or directory compilation terminated. ninja: build stopped: subcommand failed. > Roll chromium_revision 280876:281094 > > No significant DEPS changes in this roll, only some changes > in how clang_format is downloaded. > > BUG= > TEST=Local testing as trybots currently cannot handle DEPS changes properly. > R=niklas.enbom@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/20829004 TBR=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20839004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6598 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index 1ca77ae418..8629afb99d 100644 --- a/DEPS +++ b/DEPS @@ -11,7 +11,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "281094", + "chromium_revision": "280876", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", @@ -54,6 +54,9 @@ deps = { "third_party/clang_format": Var("chromium_trunk") + "/src/third_party/clang_format@" + Var("chromium_revision"), + "third_party/clang_format/script": + From("chromium_deps", "src/third_party/clang_format/script"), + "third_party/colorama/src": From("chromium_deps", "src/third_party/colorama/src"), @@ -313,7 +316,7 @@ hooks = [ "--platform=win32", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/win/clang-format.exe.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/win/clang-format.exe.sha1", ], }, { @@ -324,7 +327,7 @@ hooks = [ "--platform=darwin", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/mac/clang-format.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/mac/clang-format.sha1", ], }, { @@ -335,18 +338,9 @@ hooks = [ "--platform=linux*", "--no_auth", "--bucket", "chromium-clang-format", - "-s", Var("root_dir") + "/buildtools/linux64/clang-format.sha1", + "-s", Var("root_dir") + "/third_party/clang_format/bin/linux/clang-format.sha1", ], }, - { - # Remove clang-format binaries from third_party/clang_format/bin that - # aren't used anymore. - # TODO(kjellander) remove this and the .gitignore entry after the end of - # July, 2014. - "name": "remove_old_clang_format_binaries", - "pattern": ".", - "action": ["python", "src/third_party/clang_format/bin/rm_binaries.py"], - }, { # Pull clang if on Mac or clang is requested via GYP_DEFINES. "pattern": ".", -- cgit v1.2.3