This is needed for the new libXi.
BUG=chromium:112329
TEST=by hand
Change-Id: I1dae9a3df7b1d0a1407efffa943dfe9053ac611b
Reviewed-on: https://gerrit.chromium.org/gerrit/19540
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/19941
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Upgraded virtual/krb5 to version 0 on amd64, arm, x86.
We want the new style virtual to match what upstream Gentoo has done.
BUG=chromium-os:24036
TEST=`emerge mit-krb5 openssh` worked
TEST=`cbuildbot chromiumos-sdk` worked
Change-Id: Iff9d5e3dc1f9abc362f116456c5c2adc58b0085a
Reviewed-on: https://gerrit.chromium.org/gerrit/19679
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded app-crypt/mit-krb5 to version 1.9.2-r2 on amd64, arm, x86.
This only gets used in the cros_sdk, and just because our ssh config
uses kerberos config options. We need a newer mit-krb5 to support
the new style virtual/krb5.
BUG=chromium-os:24036
TEST=`emerge mit-krb5 openssh` worked
TEST=`cbuildbot chromiumos-sdk` worked
Change-Id: Ic79738a7b952bb1717cd1ebfdec7c87d91d438c1
Reviewed-on: https://gerrit.chromium.org/gerrit/19678
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This change adds the ability for a caller to pass a specific version name
to build_image rather than rely on parsing of chromeos_version.sh + attempt
number.
BUG=chromium-os:29077
TEST=Ran build_image w/ w/out option
Change-Id: I69b76ae4bfc148325686902606476a0aae293e56
Reviewed-on: https://gerrit.chromium.org/gerrit/19861
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
Upgraded media-video/mplayer to version 1.0_rc4_p20120405 on amd64
BUG=chrome-os-partner:2004
TEST=emerge-link -v mplayer # pass
Change-Id: I33a46a6abdb13dd8dbb1f47f5fcbc0823cb22040
Reviewed-on: https://gerrit.chromium.org/gerrit/19348
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
To use a backchannel interface, we need to configure the connection
manager to ignore that interface. shill uses a different syntax
for that command-line option, because base's command-line parser
doesn't support the option syntax flimflam uses.
This CL adds code to rewrite the part of flimflam.conf that holds
shill's configuration options.
CQ-DEPEND=Ic2fdf49ec454995bf9378299e64378f957b9f26c
BUG=chromium-os:23531
TEST=manual (see below)
Manual testing: ran flimflam and shill on test images. Verified
that the connection manager ran with the appropriate command line
flags in both cases.
Change-Id: I57481387e207bf1ad5138a9fce9921539eed080f
Reviewed-on: https://gerrit.chromium.org/gerrit/19712
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>
If there's an error uploading a symbol file, retry it up to four times
before giving an error.
BUG=chromium-os:28985
TEST=Manually ran upload_symbols to make sure it worked with/without errors
Change-Id: Ia2159d96d0fae9042c81147249986e39f05ca398
Reviewed-on: https://gerrit.chromium.org/gerrit/19625
Commit-Ready: Michael Krebs <mkrebs@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Now that the flags variable can be "[stable]", if we don't quote its
expansion, it can match files like "t" resulting in bad flags being
passed to crossdev.
BUG=None
TEST=`touch t; ./setup_board --board=x86-alex` no longer results in "tgcc"
Change-Id: I866e934776e2d47a2c99bd08964017014aace97f
Reviewed-on: https://gerrit.chromium.org/gerrit/19595
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This is needed to use XInput 2.2.
BUG=chromium:112329
TEST=by hand
Change-Id: I9e019185aeb7f0e93aa351232690895916214344
Reviewed-on: https://gerrit.chromium.org/gerrit/19541
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
This is needed for the new libXi.
BUG=chromium:112329
TEST=by hand
Change-Id: I4b94a4b72630337610ac950cbfe4b403f819a92c
Reviewed-on: https://gerrit.chromium.org/gerrit/19540
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
This is needed for the libX11 update.
BUG=chromium:112329
TEST=by hand
Change-Id: I50dab9fde948f2f2b9a02fb2031304b0df959246
Reviewed-on: https://gerrit.chromium.org/gerrit/19539
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Obtained from upstream Gentoo
BUG=chromium-os:28924
TEST=emerge snappy
Change-Id: Ib65ebf26cef0d142daa11c66b2de2c7a51a8fb69
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/19609
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Add net-misc/corkscrew version 2.0 on amd64 in portage-stable.
This utility is meant for use in the chroot to enable the use of proxy
network connections.
BUG=None
TEST=Verify corkscrew emerges and than runs (sudo emerge corkscrew in chroot)
Change-Id: I5b59fcdfda1cfd6ffafe03c913f58ff2bb43adf2
Reviewed-on: https://gerrit.chromium.org/gerrit/19568
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
Commit-Ready: Bernie Thompson <bhthompson@chromium.org>
Crash server file size limit has been increased to 300MB
BUG=chromium-os:23765
TEST=Manually ran upload_symbols for chrome.sym
Change-Id: I9c683ad057abda1f8df7550243cd5c870228257c
Reviewed-on: https://gerrit.chromium.org/gerrit/19569
Commit-Ready: Michael Krebs <mkrebs@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>
Reviewed-by: Eric Blake <eblake@chromium.org>
Upgraded sys-apps/util-linux to version 2.21 on amd64, arm, x86.
This includes fixes from upstream which are biting us. Like loop
file handling.
We can reland this now that all targets have USE=static-libs set.
BUG=chromium-os:26483
TEST=`cbuildbot amd64-generic-full` worked
TEST=`cbuildbot arm-tegra2-full` worked
TEST=`cbuildbot x86-generic-full` worked
Change-Id: I4d9111e659fd35c7d2a99c6207fd19ecfe0856b1
Reviewed-on: https://gerrit.chromium.org/gerrit/19520
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded app-misc/screen to version 4.0.3-r4 on amd64, arm, x86.
Nothing depends on this as it's a dev-only package, so should be
trivial to merge.
BUG=None
TEST=`emerge screen` worked
TEST=`emerge-x86-alex screen` worked
Change-Id: I9920525c0b41a1c12665a0207dddfb6990cb2065
Reviewed-on: https://gerrit.chromium.org/gerrit/19532
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Make sure our chroot has pbzip2 as early as possible so we can leverage
it later on in the build process as the default compressor.
BUG=None
TEST=semi-manual:
- remove pbzip2 as soon as we've unpacked the chroot in make_chroot
- run `cros_sdk` and see no pbzip2 warnings
Change-Id: I27d00cdb97c5ffcde79eb04cfabbe6e82a72c706
Reviewed-on: https://gerrit.chromium.org/gerrit/19469
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Upgraded sys-apps/util-linux to version 2.21 on amd64, arm, x86.
This includes fixes from upstream which are biting us. Like loop
file handling.
BUG=chromium-os:26483
TEST=`cbuildbot amd64-generic-full` worked
TEST=`cbuildbot arm-tegra2-full` worked
TEST=`cbuildbot x86-generic-full` worked
Change-Id: I5d94443d7f182adac757a751e21418c050978c38
CQ-DEPEND=I8f254dcec47bd8a75a8a856640149720db8afc5d
Reviewed-on: https://gerrit.chromium.org/gerrit/19384
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
mplayer is very helpful in test images, factory test images, and maybe
even as a reference player for all purposes (also already used in some
previous factory tests).
BUG=chrome-os-partner:2004
TEST=none, the original copy from upstream.
Change-Id: Idb6398964538bdbc6538c8545fc9a41ef845c609
Reviewed-on: https://gerrit.chromium.org/gerrit/19302
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
This will be needed for newer mesa versions.
Change-Id: I61ef8eb0c4823381a9d68eb0b530d3b5a904d428
Reviewed-on: https://gerrit.chromium.org/gerrit/19375
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
This makes us fail if /etc/localtime doesn't point at
/var/lib/timezone/localtime.
BUG=chromium-os:27413
TEST=manual: error from build_image after i patched chromeos-base to not create the symlink
Change-Id: I11ef272c2dcd67a189a5d67c46792490ec6d27a1
Reviewed-on: https://gerrit.chromium.org/gerrit/19335
Tested-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Daniel Erat <derat@chromium.org>
Upgraded x11-misc/x11vnc to version 0.9.9 on amd64, arm, x86
BUG=chromium-os:28721
TEST=gmerge x11vnc and run on device. Try connecting to vnc from
desktop.
Change-Id: I6c3c8b702f35abdb065dc398f78b3370c4c7b67c
Reviewed-on: https://gerrit.chromium.org/gerrit/19353
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Robert Flack <flackr@chromium.org>
Commit-Ready: Robert Flack <flackr@chromium.org>
Upgraded app-misc/editor-wrapper to version 4 on amd64, arm, x86.
This is more to get us onto the Gentoo version and off our local one.
BUG=chromium-os:11991
TEST=`cbuildbot chromiumos-sdk` worked
Change-Id: Ie38f53ec8e25feff59373ccb5494cda62d6751ca
Reviewed-on: https://gerrit.chromium.org/gerrit/19301
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Upgraded app-admin/sudo to version 1.8.3_p2 on amd64, arm, x86.
This is more to get us onto the Gentoo version and off our local one.
BUG=chromium-os:11991
TEST=`cbuildbot chromiumos-sdk` worked
Change-Id: Ie86036c724be855e0565656e41da2cdc0713cbdb
Reviewed-on: https://gerrit.chromium.org/gerrit/19300
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Now that the newer build-docbook-catalog supports ROOT, we don't need
to manually run this ourselves.
BUG=chromium-os:18036
TEST=`cbuildbot chromiumos-sdk` works
Change-Id: I3a89701a49623f9e50e651af9d8d505608fdc615
Reviewed-on: https://gerrit.chromium.org/gerrit/19252
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Upgraded media-libs/libjpeg-turbo to version 1.2.0-r1 on amd64, arm, x86.
Just did compile tests as no package depends on this (yet).
BUG=chromium-os:25237
TEST=`emerge-amd64-generic libjpeg-turbo` works
TEST=`emerge-arm-generic libjpeg-turbo` works
TEST=`emerge-x86-generic libjpeg-turbo` works
Change-Id: Id8f49dba10bce3ddf93c63d1cc0ea7e271390b62
Reviewed-on: https://gerrit.chromium.org/gerrit/19258
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This version includes fixes for various issues we've seen over time.
BUG=chromium-os:18036
BUG=chromium-os:25859
TEST=`cbuildbot chromiumos-sdk` works
Change-Id: I0ba06eb7265c1f837144258ca69d0f9f8482cc72
Reviewed-on: https://gerrit.chromium.org/gerrit/19251
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Upgraded app-shells/bash to version 4.2_p20 on amd64, arm, x86.
This version includes parallel build fixes that are biting us.
BUG=None
TEST=`cbuildbot amd64-generic-full` worked
TEST=`cbuildbot arm-generic-full` worked
TEST=`cbuildbot x86-generic-full` worked
Change-Id: I7ced1cd378ae279da13407c7b70d22f20fb6de42
Reviewed-on: https://gerrit.chromium.org/gerrit/19240
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Needed to drop the bash dep to avoid a circular dependency between
it and newer bash.
BUG=None
TEST=`emerge-x86-generic readline` worked
Change-Id: I714c60d7f587515853d7001670d5fa2e26182ff0
Reviewed-on: https://gerrit.chromium.org/gerrit/19259
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
The update to support multiple toolchains missed one place -- selection
of gold as the linker. It would always handle just the default toolchain.
Fix up the logic so it always checks the current toolchain.
BUG=chromium-os:28548
TEST=`./setup_board --board=x86-alex` selected gold for x86_64 and i686 toolchains
Change-Id: I3c09e3a4fd91b68170fe255e37580a3c9f5f6feb
Reviewed-on: https://gerrit.chromium.org/gerrit/19226
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upgraded sys-libs/readline to version 6.2_p1 on amd64, arm, x86.
Needed for bash upgrade.
BUG=None
TEST=`cbuildbot amd64-generic-full` worked
TEST=`cbuildbot arm-generic-full` worked
TEST=`cbuildbot x86-generic-full` worked
Change-Id: I454741aa481830a8ebffcc01491343a52bfd0a50
Reviewed-on: https://gerrit.chromium.org/gerrit/19239
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
File is compiled with a path to the default magic database, but since we
install it into /usr/local rather than the normal /usr, that default path
does not work. Add a smaller wrapper script around `file` to specify the
new database location so people don't have to manually do so.
BUG=chromium-os:27725
TEST=`./build_image --board=x86-alex dev` produced an image where `file /bin/bash` worked
Change-Id: I3862cb368437a14bf1e4b6ccf4e2df3e4f774817
Reviewed-on: https://gerrit.chromium.org/gerrit/19137
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Grab the latest version from upstream Gentoo so we can drop the
copy in the chromiumos-overlay.
This one also includes pre-generated man-pages which side steps
random build failures due to broken dtd/sgml catalogs.
BUG=None
TEST=`emerge-amd64-generic evtest` works
TEST=`emerge-arm-generic evtest` works
TEST=`emerge-x86-generic evtest` works
Change-Id: Ie04f8dd1f6f91e019959277b44b1a6c09ddabb06
Reviewed-on: https://gerrit.chromium.org/gerrit/19160
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
In our build environment, we have lots of symbolic links such as
"debug/.build-id/5c/a06545ff3812557dc5fd259db4e905c5dc3484.debug" that just
link to another .debug file. In our case, those links don't actually point
to the right place, so we've just been seeing lots of "Binary does not
exist" warnings. But it would also be undesirable to actually generate
symbols for these even if their targets *did* exist.
BUG=None
TEST=Ran cros_generate_breakpad_symbols
Change-Id: I050c349f7fefbdf922d54250379bad9b3db073d7
Reviewed-on: https://gerrit.chromium.org/gerrit/19182
Commit-Ready: Michael Krebs <mkrebs@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Upgraded dev-lang/ruby to version 1.8.7_p357 on amd64, arm, x86
BUG=chromium-os:25049
TEST=ran build-packages for and64-generic but I don't think that tests ruby.
Change-Id: I82a47c2592b3f56793f3418c1ba6f0498f4c29ed
Reviewed-on: https://gerrit.chromium.org/gerrit/19109
Tested-by: Paul Taysom <taysom@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Paul Taysom <taysom@chromium.org>
Upgraded sys-fs/lvm2 to version 2.02.88 on amd64, arm, x86. We want
a newer version that installs udev rules into /lib/ all the time.
BUG=chromium-os:27772
TEST=`emerge-amd64-generic lvm2` worked and installed rules into /lib/udev/rules.d/
TEST=`emerge-arm-generic lvm2` worked and installed rules into /lib/udev/rules.d/
TEST=`emerge-x86-generic lvm2` worked and installed rules into /lib/udev/rules.d/
Change-Id: Iecf6b5f94c12c36f514aea2b485e524f92798040
Reviewed-on: https://gerrit.chromium.org/gerrit/19117
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
The latest gcc-config will accept the CHOST setting from the host env,
so export that variable since we already spent the time running portageq
to get it. This allows gcc-config to never execute portageq, and since
we run it multiple times, it helps in every invocation.
Along those lines, make sure we run gcc-config with `sudo -E` to pass
through the setting.
Since awk can handle regexps, merge the grep|awk into a single awk call.
Finally, there was a slight logic typo where we would always re-run
gcc-config even when the profiles were the same. This does not match
the comments, nor the spirit of this code, so fix the operator typo.
BUG=None
TEST=`./update_chroot` still works and doesn't re-select the toolchain
Change-Id: If73df81c014219f8f9ab5895e59d055696add777
Reviewed-on: https://gerrit.chromium.org/gerrit/19164
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Upstream Gentoo renamed this virtual, so follow suite.
BUG=None
TEST=`cbuildbot amd64-generic-full` worked
TEST=`cbuildbot arm-tegra2-full` worked
TEST=`cbuildbot x86-generic-full` worked
Change-Id: I2721c85fe83f4ee8a90533eda14813697430e98e
Reviewed-on: https://gerrit.chromium.org/gerrit/18781
Reviewed-by: Olof Johansson <olofj@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
This CL adds uinput module in INSTALL_MASK so that the module
is not installed to non-test image. A mod_image_for_test script
is implemented to install the module in the test image if the
uinput module exists.
BUG=chromium-os:26707
TEST=Build a base image and a test image. Check the directory
/lib/modules/<version>/kernel/drivers/input/misc
where current <version> is 3.2.7.
In the base image, there should be no uinput.ko,
while in the test image, there should be uinput.ko.
CQ-DEPEND=Ie96242c4d56403866a2298db2ba3bd6459248c1b
Change-Id: I0ca6599f80b9bb72cdc044fc97cdf990ce550edc
Reviewed-on: https://gerrit.chromium.org/gerrit/19032
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Tested-by: Joseph Shyh-In Hwang <josephsih@chromium.org>
Commit-Ready: Joseph Shyh-In Hwang <josephsih@chromium.org>
'dump_syms' was recently changed to be built 64-bit, with a 32-bit version
available as 'dump_syms.32'. This change makes use of the 32b dump_syms if
a file is built 32b. For almost all targets nowadays, we should only see
64b files, but things like the installer can still be 32b. Also see
https://gerrit.chromium.org/gerrit/14835.
BUG=chromium-os:22778
TEST=Ran cros_generate_breakpad_symbols on 32/64-bit executables
CQ-DEPEND=I6551fe22fb0caebd3584f76f95a543e9a91b7e1b
Change-Id: I780c20eeb745a919dbe130cf3cede7ec5ca6483a
Reviewed-on: https://gerrit.chromium.org/gerrit/18569
Commit-Ready: Michael Krebs <mkrebs@chromium.org>
Tested-by: Michael Krebs <mkrebs@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
