diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 07:57:23 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 07:58:58 +0000 |
| commit | d94a195ebeb384d72d775391bd5f2fff291be667 (patch) | |
| tree | b5cc9a8d870a0c64a5887f68e2736d0fbad16ab4 /native_client_sdk | |
| parent | 8c0ac804f0cbcfeda4034667ad9c0e4976805470 (diff) | |
| download | chromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.zip chromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.tar.gz chromium_src-d94a195ebeb384d72d775391bd5f2fff291be667.tar.bz2 | |
Revert 288164 "Roll gtest and gmock DEPS."
Suspected to have broken the Chrome Win build:
c:\b\build\slave\google-chrome-rel-win\build\src\base\numerics\safe_numerics_unittest.cc(577) : error C2220: warning treated as error - no 'object' file generated
c:\b\build\slave\google-chrome-rel-win\build\src\base\numerics\safe_numerics_unittest.cc(577) : warning C4756: overflow in constant arithmetic
> Roll gtest and gmock DEPS.
>
> These DEPS have not been updated for ~2 years, so there is a good chance
> something will blow up. Due to interdependancy between the repos,
> rolling gtest required gmock also be rolled.
>
> BUG=none
>
> Review URL: https://codereview.chromium.org/425333002
TBR=ncbray@chromium.org
Review URL: https://codereview.chromium.org/454823002
Cr-Commit-Position: refs/heads/master@{#288239}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/libraries/gmock/library.dsc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/native_client_sdk/src/libraries/gmock/library.dsc b/native_client_sdk/src/libraries/gmock/library.dsc index 8b685a5..074d131 100644 --- a/native_client_sdk/src/libraries/gmock/library.dsc +++ b/native_client_sdk/src/libraries/gmock/library.dsc @@ -37,7 +37,6 @@ 'gmock.h', 'gmock-matchers.h', 'gmock-more-actions.h', - 'gmock-more-matchers.h', 'gmock-spec-builders.h', ], 'DEST': 'include/gmock', |