Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Issue 20605004: Revert 214020 "NaCl: Update revision in DEPS, r11830 -> r11866" (Closed)

Created:
7 years, 5 months ago by Mallinath (Gone from Chromium)
Modified:
7 years, 4 months ago
Reviewers:
Mark Seaborn
CC:
chromium-reviews
Visibility:
Public.

Description

Revert 214020 "NaCl: Update revision in DEPS, r11830 -> r11866" Compile failed on Linux aura. > NaCl: Update revision in DEPS, r11830 -> r11866 > > This pulls in the following Native Client changes: > > r11831: (shcherbina) Remove auxiliary scripts related to text-based spec. > r11832: (shcherbina) Make all sections in targeted tests required. > r11833: (phosek) Grab the address space lock before calling to Vmmap in mprotect > r11834: (khim) Roll binutils revision to pull in updated objdump > r11835: (jvoung) Update NaCl perf expecations for nacl-gcc (from change at 11467). > r11836: (jvoung) Update PNaCl from 11755 to 11829. > r11837: (jfb) Test no-read uses of synchronization primitives > r11838: (jfb) Split synchronization tests > r11839: (jfb) Update Clang DEPS > r11840: (jfb) Update TOOL_REVISIONS for PNaCl 11829->11839 > r11841: (shcherbina) Change prefix handling in text-based validator spec. > r11842: (shcherbina) Split 0f18 validator targeted test into nicer chunks. > r11843: (shcherbina) Bump TOOL_REVISIONS to reflect update to nacl-objdump > r11844: (shcherbina) Rename gyp_compile_ragel build step to gyp_compile_NOragel. > r11845: (shcherbina) Remove REXW prefix from validator targeted test that exposes DATA16+REP bug. > r11846: (shcherbina) Disallow REP prefixes except in string instructions in text-based validator spec. > r11847: (phosek) Update NaClDesc flags in subclass ctor instead of overwriting them > r11848: (thakis) Make inttypes.h and similar macro usage C++11-friendly. > r11849: (mseaborn) Cleanup: Remove the "minimal x86-64 test" Buildbot step for Mac OS X > r11850: (mseaborn) command_tester.py: Remove clause for x86-32 Windows that is no longer used > r11851: (jvoung) Update perf expectations for PNaCl after 3.3 merge, etc. > r11852: (jvoung) Disable zlib features in LLVM shared lib builds to avoid dependency. > r11853: (mseaborn) Remove use of POSIX signal handling on Mac OS X > r11854: (dschuff) Update PNaCl binutils deps > r11855: (dschuff) PNaCl: Update LLVM revision in pnacl/DEPS > r11856: (jvoung) Update PNaCl rev in TOOLS_REVISION 11839 -> 11852. > r11857: (kschimpf) PNaCl: Update LLVM revision in pnacl/DEPS > r11858: (kschimpf) PNaCl: Update LLVM revision in pnacl/DEPS. > r11859: (sbc) Remove errno and __errno from libnosys. > r11860: (shcherbina) Weaken sel_ldr dependency on old x86 validator. > r11861: (shcherbina) Split tls and string instruction tests into nicer chunks. > r11862: (shcherbina) Disable nop patching in validator targeted tests. > r11863: (shcherbina) Remove remnants of nop patching from validator targeted tests. > r11864: (jvoung) Remove pnacl-nmf and GENNMF now that it is removed from chrome scons tests. > r11865: (dschuff) Check for 64-bit phdrs for the TLS template in any x86-64 compilation > r11866: (thakis) Let `gclient sync` in Chromium work on *BSD. > > BUG=none > TEST=browser_tests and nacl_integration > > Review URL: https://codereview.chromium.org/20754005 TBR=mseaborn@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214025

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M trunk/src/DEPS View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 3 (0 generated)
Mallinath (Gone from Chromium)
7 years, 5 months ago (2013-07-27 03:51:50 UTC) #1
Mallinath (Gone from Chromium)
Committed patchset #1 manually as r214025.
7 years, 5 months ago (2013-07-27 03:52:23 UTC) #2
Mark Seaborn
7 years, 4 months ago (2013-07-30 18:05:38 UTC) #3
On 26 July 2013 20:51, <mallinath@chromium.org> wrote:

> Reviewers: Mark Seaborn,
>
> Description:
> Revert 214020 "NaCl: Update revision in DEPS, r11830 -> r11866"
>
> Compile failed on Linux aura.
>

LGTM for the record.

Specifically, the compile failure was:

[11732/11733] LINK unit_tests
...
../../third_party/gold/gold64: error:
obj/chrome/browser/ui/libgtk2ui/libgtk2ui.a(obj/chrome/browser/ui/libgtk2ui/gtk2ui.gtk2_util.o):
multiple definition of 'ui::KeyboardCodeFromXKeysym(unsigned int)'
../../third_party/gold/gold64:
obj/ui/libui.a(obj/ui/base/keycodes/ui.keyboard_code_conversion_x.o):
previous definition here
../../third_party/gold/gold64: error:
obj/chrome/browser/ui/libgtk2ui/libgtk2ui.a(obj/chrome/browser/ui/libgtk2ui/gtk2ui.gtk2_util.o):
multiple definition of 'ui::KeyboardCodeFromXKeyEvent(_XEvent*)'
../../third_party/gold/gold64:
obj/ui/libui.a(obj/ui/base/keycodes/ui.keyboard_code_conversion_x.o):
previous definition here
...

I've fixed the underlying problem in
https://codereview.chromium.org/20900002/.  Somehow the NaCl DEPS roll
tickled the broken #include.

Mark

Powered by Google App Engine
This is Rietveld 408576698