Граф коммитов

5600 Коммитов

Автор SHA1 Сообщение Дата
hans@chromium.org 67c7ddf7a1 Set -fmsc-version for the Windows Clang build
It's important that -fmsc-version matches the version of VS that we're
falling back to. In practive, this should always be 2013 these days.

BUG=82385
NOTRY=true

Review URL: https://codereview.chromium.org/151663004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250511 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 21:22:00 +00:00
elan.ruusamae@gmail.com 3b20ef5191 add system libXNVCtrl library support in linux unbundle
originally developed here:
ea20959146/system-libxnvctrl.patch

reviewed by phajdan.jr in private mail exchange

R=phajdan.jr@chromium.org
BUG=

Review URL: https://codereview.chromium.org/120533002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250495 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 20:53:42 +00:00
aberent@chromium.org 0a747f0761 Remove shim classes etc. that were needed to move Android Loader
Also those needed to move the Trace classes to base, and tidy
up the other TODOs left over from these moves.

Depends on:
https://codereview.chromium.org/141223002 and
https://chrome-internal-review.googlesource.com/#/c/153179

BUG=225101

Review URL: https://codereview.chromium.org/152663002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250479 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 19:59:20 +00:00
mbarbella@chromium.org 6b578bd72d Fix d8 dependency in chromium_builder_asan target.
BUG=
R=inferno@chromium.org

Review URL: https://codereview.chromium.org/156283004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250457 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 18:51:28 +00:00
thakis@chromium.org b22ece862b Build app_list_unittests as part of chromium_builder_tests on linux.
Should fix problems like http://build.chromium.org/p/tryserver.chromium/builders/linux_rel/builds/227387

BUG=none
TBR=erg@chromium.org

Review URL: https://codereview.chromium.org/131543015

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250402 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 14:35:57 +00:00
robertshield@chromium.org 79cf8a5b17 Add --no-logo to reorder-imports.py.
Note, depends on https://codereview.appspot.com/57170049/ landing and Syzygy DEPS rolling to take effect.

BUG=335802
TEST=Silent builds again!

Review URL: https://codereview.chromium.org/148933005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250388 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 14:04:59 +00:00
phajdan.jr@chromium.org 615523942d Whitespace change to kick off bots.
TBR=iannucci

BUG=338501

Review URL: https://codereview.chromium.org/150833003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250371 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 06:46:49 +00:00
phajdan.jr@chromium.org 04a722a6e8 Whitespace change to kick off master.chromium.linux bots.
TBR=iannucci

BUG=338501

Review URL: https://codereview.chromium.org/153993020

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250344 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 04:40:09 +00:00
r.c.ladan@gmail.com 464a1f9416 Add FreeBSD as a supported platform using ninja.
TEST=	run 'gclient sync' on a FreeBSD system.
BUG=

Review URL: https://codereview.chromium.org/132333021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250318 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 03:54:20 +00:00
jamesr@chromium.org 6d835b51bb Clean up dependencies on X11 libraries
This converts the remaining targets that depend on X11 libraries over to
depending on targets from build/linux/system.gyp instead of adding the
libraries manually to the link line. This ensures that the link line is
generated with pkg-config and makes the dependencies a bit tighter by
getting rid of the all_dependent_settings entry in ui/ui.gyp

BUG=339518

Review URL: https://codereview.chromium.org/151713003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250311 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 03:38:06 +00:00
thakis@chromium.org ea75f3e120 Use exception instead of sys.exit().
Addresses a review comment from frankf at https://codereview.chromium.org/157743004/

BUG=142642

Review URL: https://codereview.chromium.org/154153008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250302 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 02:52:10 +00:00
thakis@chromium.org f0077495b5 android envsetup: Stop setting branding=Chrome buildtype=Official.
They are now set by the internal build script that also sets
CHROME_ANDROID_OFFICIAL_BUILD
( https://chrome-internal-review.googlesource.com/154265 ).

No intended behavior change.

BUG=330631
R=yfriedman@chromium.org

Review URL: https://codereview.chromium.org/159143003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250296 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 02:38:31 +00:00
dfalcantara@chromium.org 73c7d163d1 Revert of Remove Android filter files for base_unittests (https://codereview.chromium.org/151913003/)
Reason for revert:
Broke the Blink Android Tests (dbg) bot:

http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20(dbg)

Neither of us can repro failures locally, reverting.

Original issue's description:
> Remove Android filter files for base_unittests
> 
> BUG=339980
> R=bulach@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250169

TBR=bulach@chromium.org,phajdan.jr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=339980

Review URL: https://codereview.chromium.org/157593007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250294 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 02:37:29 +00:00
hans@chromium.org 42fa32da4a Suppress some more warnings for Clang Windows builds
BUG=82385

Review URL: https://codereview.chromium.org/159123003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250278 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 02:05:13 +00:00
jbudorick@chromium.org 41ed360447 Revert of Enable presubmit pylint in build/android. (https://codereview.chromium.org/132463007/)
Reason for revert:
This patch is probably the cause of crbug.com/342539.

Original issue's description:
> Enable presubmit pylint in build/android.
> 
> BUG=168518
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249793

TBR=craigdh@chromium.org,frankf@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=168518

Review URL: https://codereview.chromium.org/153743008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250269 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 01:47:41 +00:00
jbudorick@chromium.org 4ccb88e6a3 Revert of Fix an errant pylint change. (https://codereview.chromium.org/143623007/)
Reason for revert:
crbug.com/342539 is likely happening because of the patch that this patch depends on. I need to ensure that logcats work on the bots before relanding (and that the corresponding steps fail if they don't.)

Original issue's description:
> I broke something by removing an apparently unused import that actually was used elsewhere. I addressed the issue by having the client code just call android_commands.GetAttachedDevices explicitly.
> 
> BUG=168518
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250206

TBR=craigdh@chromium.org,frankf@chromium.org,cjhopman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=168518

Review URL: https://codereview.chromium.org/159453002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250264 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-11 01:20:33 +00:00
thestig@chromium.org a833cec06e Findbugs: Fix public static fields in AwResource.java.
Review URL: https://codereview.chromium.org/149113003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250233 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 23:13:50 +00:00
kjellander@chromium.org 4054b9e0e2 Add libpeerconnection.{so,dll} to browser_tests.isolate
BUG=none

Review URL: https://codereview.chromium.org/153093002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250207 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 21:14:46 +00:00
jbudorick@chromium.org c3ffd2a73d I broke something by removing an apparently unused import that actually was used elsewhere. I addressed the issue by having the client code just call android_commands.GetAttachedDevices explicitly.
BUG=168518

Review URL: https://codereview.chromium.org/143623007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250206 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 21:12:03 +00:00
thakis@chromium.org dca8980cb9 android envsetup: Don't set script-local variable toolchain_dir.
Unused after r250141. No behavior change.

BUG=330631
TBR=torne@chromium.org

Review URL: https://codereview.chromium.org/159133002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250187 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 20:11:34 +00:00
phajdan.jr@chromium.org 413ebe5efe Remove Android filter files for base_unittests
BUG=339980
R=bulach@chromium.org

Review URL: https://codereview.chromium.org/151913003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250169 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 19:25:55 +00:00
thakis@chromium.org 89105d9828 android envsetup: Stop exporting ANDROID_TOOLCHAIN.
build/common.gypi already sets <(android_toolchain) independently of this
env var, and nothing seems to really depend on the env var.
(tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py uses it
to print a better error message if it's available, but that doesn't seem
important.)

BUG=330631
R=torne@chromium.org

Review URL: https://codereview.chromium.org/146723004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250141 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 17:50:39 +00:00
aberent@chromium.org d9bb84216f Move the android library loader from content to base
The android library loader has no logical connection with content. Mojo
shell, which doesn't depend on content, wants to use it. This CL
moves it from content to base.

BUG=225101
NOTRY=true

Review URL: https://codereview.chromium.org/141223002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250113 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 16:19:22 +00:00
thakis@chromium.org 2ef2f58ba2 android envsetup: Stop exporting STRIP.
After the changes in crbug.com/142642 , this should no longer be used.

BUG=142642

Review URL: https://codereview.chromium.org/132953003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250109 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 16:04:36 +00:00
bulach@chromium.org 10f3af06db Android: follow up on crrev.com/250035, remove unused import.
BUG=142642
NOTRY=True

Review URL: https://codereview.chromium.org/158963002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250098 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 14:42:48 +00:00
thakis@chromium.org 569987e51a android: Require exe unittests to have a foo_unittest_stripped target.
This allows the test runner to not depend on the STRIP env var, which is going away.

Other approaches considered:
1. Converting the remaining exe-based tests to apk tests. The apk versions
   were slower, and didn't pass without other changes though.
2. Just don't strip. But that slows down these two tests by over 100%
   (due to copying data to the device is slow, and stripped size is 0.5MB while
   unstripped size is on the order of 10MB).
3. Try to get a trip binary from third_party/android_tools/ndk. That's fiddly
   since it requires getting the right arch.

Since there are only two exe-based tests left, just strip them from gyp.
Medium-term, maybe gyp/mac's postbuild stuff can be brought to android,
it looks like there are various things that could be made simpler with that.

BUG=142642
TEST=
build/android/test_runner.py gtest -s sandbox_linux_unittests &&
build/android/test_runner.py gtest -s breakpad_unittests

R=bulach@chromium.org, frankf@chromium.org
TBR=jln, thestig

Review URL: https://codereview.chromium.org/157743004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250035 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 02:18:13 +00:00
sorin@chromium.org 414cad4b56 Trigger the bots using the build/whitespace_file.txt to retry iOS Device
bot which is red.

TBR=skobes@chromium.org
NOTREECHECKS=true
BUG=

Review URL: https://codereview.chromium.org/146083005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250034 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-10 02:16:16 +00:00
thakis@chromium.org 6e3ddc2f37 cycle bots
Review URL: https://codereview.chromium.org/137383016

git-svn-id: http://src.chromium.org/svn/trunk/src/build@250025 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-09 23:55:01 +00:00
caitkp@chromium.org 20d33f5870 Call SwapImports on x64 builds too.
BUG=335173

Review URL: https://codereview.chromium.org/149023008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249859 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-08 00:08:18 +00:00
dfalcantara@chromium.org a7cdee0870 Disable flaky unittest
TracingControllerTest.EnableCaptureAndDisableMonitoringWithFilePath has been flaking consistently.

NOTRY=true
TBR=wangxianzhu
BUG=341995

Review URL: https://codereview.chromium.org/157923002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249842 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 23:12:13 +00:00
jbudorick@chromium.org 3d8bcfb710 Enable presubmit pylint in build/android.
BUG=168518

Review URL: https://codereview.chromium.org/132463007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249793 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 21:34:23 +00:00
mbarbella@chromium.org b9068d357b Add d8 to the chromium_builder_asan target.
BUG=
R=inferno@chromium.org

Review URL: https://codereview.chromium.org/157143003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249758 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 20:31:56 +00:00
brettw@chromium.org 771e71e45a GN iOS build fixes.
This properly sets the DEPLOYMENT_TARGET in the generated GYP file (previously this value wa salways hardcoded to empty -- whoops!).

Sets the simulator properly. Previously when not using an explicit SDK the Xcode generator would still end up with a simulator build. This turns the flag into a tri-state so gyp_chromium can set it explicitly when an SDK is specified, but otherwise we can trigger default behavior based on Xcode/Ninja.

TBR=scottmg

Review URL: https://codereview.chromium.org/155983003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249643 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 09:02:37 +00:00
brettw@chromium.org 19bfe364ed GN: Remove android arguments from the conditional
This will make it possible to pull GN binaries on Linux which is currently blocked on the Android AOSP bot complaining about unused parameters.

TBR=scottmg

Review URL: https://codereview.chromium.org/157273002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249642 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 08:59:25 +00:00
tfarina@chromium.org 94dad9c6aa Update remaining references to the NPAPI test plugin.
This should fix all the references to TestNetscapePlugIn and
blink_test_plugin.gyp:blink_test_plugin.

BUG=331302
TEST=None
R=jochen@chromium.org,mark@chromium.org

Review URL: https://codereview.chromium.org/154573003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249637 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 08:46:56 +00:00
brettw@chromium.org f887a7d363 Inject default libraries to all targets in GN.
In GYP Mac, most targets got a default set of mac libraries by virtue
of depending on base, which due to a GYP bug pushed the libraries to
all targets depending on base, even separate shared libraries.

In GYP Windows the set of default libraries on Windows is global and
this keeps the same list and behavior.

The lists of libraries could use some cleanup, btu this patch just
attempts to keep the status quo in a cleaner way rather than fixing the
unreasonable list of libraries (especially on Windows).

R=scottmg@chromium.org, scottmg

Review URL: https://codereview.chromium.org/131513026

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249600 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-07 03:59:56 +00:00
thestig@chromium.org 67693742d8 [Android WebView] Add AwResource.setResources() and setErrorPageResources().
This is part 1 of a two-sided patch to get rid of public static fields
in AwResource.java.

R=mnaganov@chromium.org

Review URL: https://codereview.chromium.org/155653003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249505 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 21:29:07 +00:00
mbarbella@chromium.org 5b4fdd5468 Revert of Add d8 to the chromium_builder_asan target. (https://codereview.chromium.org/142693006/)
Reason for revert:
This may be causing issues with runhooks. Reverting to be safe until I have time to investigate.

Original issue's description:
> Add d8 to the chromium_builder_asan target.
> 
> BUG=
> R=machenbach@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249433

TBR=machenbach@chromium.org,phajdan.jr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/156863002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249474 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 19:53:46 +00:00
bulach@chromium.org fb48e3b4d4 Android: changes the JNI generator to use long by default.
BUG=317523

Review URL: https://codereview.chromium.org/131883002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249461 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 18:46:45 +00:00
mbarbella@chromium.org a95eac0ba3 Add d8 to the chromium_builder_asan target.
BUG=
R=machenbach@chromium.org

Review URL: https://codereview.chromium.org/142693006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249433 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 17:51:43 +00:00
ctruta@blackberry.com 206a128a8f Add support for threading and atomic ops in QNX Neutrino.
BUG=

Patch by:
Eli Fidler <efidler@blackberry.com>,
Jeff Rogers <jrogers@blackberry.com>,
Cosmin Truta <ctruta@blackberry.com>.

Review URL: https://codereview.chromium.org/156233002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249390 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 12:27:37 +00:00
wibling@chromium.org 2ebefa8418 Re-enable the two blink heap unit tests.
These should work now after fixing bug 340591.

R=ager@chromium.org, erik.corry@gmail.com, haraken@chromium.org, vegorov@chromium.org, zerny@chromium.org
BUG=340591

Review URL: https://codereview.chromium.org/147123010

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249388 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 12:24:35 +00:00
zty@chromium.org be8d5ba176 Re-enable content_browsertests on main waterfall.
Disabled the two tests that are crashing on android.

TBR=jam
BUG=341142

Review URL: https://codereview.chromium.org/153503005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249358 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 11:22:18 +00:00
tnagel@chromium.org 94abda0347 Use "second" instead of "sec" in TimeRemainingLong()
This makes more sense, also it is consistent with
TimeDurationLong().

At that occasion, fix bad grammar in ui_strings.grd.

Unit testing is provisional and will be adjusted once
https://codereview.chromium.org/139413005/ has landed.

BUG=340113
TEST=full unit test coverage

Review URL: https://codereview.chromium.org/150573011

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249335 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 10:31:44 +00:00
grt@chromium.org 6a07832f63 Set MinimumRequiredVersion for XP support on x86 builds.
BUG=297971
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/140623005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249318 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 09:49:21 +00:00
brettw@chromium.org 94c2bc8bc0 Add Linux SDK to GN build.
I forgot to actually reference this config when I created it.

R=thakis@chromium.org
TBR=thakis

Review URL: https://codereview.chromium.org/155653002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249301 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 08:35:34 +00:00
thakis@chromium.org 7787ae35da cycle bots
Review URL: https://codereview.chromium.org/147393004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249283 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 05:29:53 +00:00
sdefresne@chromium.org b644ea22a2 Fix compilation of base for arm64
Add support for the architecture to build/build_config.h (define
new macro ARCH_CPU_ARM64 to identify the CPU architecture and
set the other appropriate macros to 1).

Fix DEBUG_BREAK_ASM() macro to expand to the correct instruction
on arm64 cpu (as instruction set is not compatible with previous
version of ARM instruction sets).

BUG=339477
R=mark@chromium.org

Review URL: https://codereview.chromium.org/145273028

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249246 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 02:51:01 +00:00
scottmg@chromium.org 7aef8e0121 Move landmines into gyp_chromium
This ensures that the environment that's passed to gyp is the one that
landmines.py uses to determine when to set landmines.

Also, fix '2013e' not being detected as a 2013 switch.

BUG=309197, 323300
R=iannucci@chromium.org

Review URL: https://codereview.chromium.org/153073004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249242 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 02:44:55 +00:00
piman@chromium.org 557b3d9f34 Fix android build
BUG=none

Review URL: https://codereview.chromium.org/152993004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@249194 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-02-06 01:18:03 +00:00