diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-03 03:15:08 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-03 03:15:08 +0000 |
commit | 0bf0190a99a0ec4ec7906f379bf26f8981d7d05d (patch) | |
tree | 9401d95cff410f93a70cf289ccb9d542e7d03d9b /net/net.gyp | |
parent | 4273961fd75d6b19df82d4bde94cfe101b60e9cb (diff) | |
download | chromium_src-0bf0190a99a0ec4ec7906f379bf26f8981d7d05d.zip chromium_src-0bf0190a99a0ec4ec7906f379bf26f8981d7d05d.tar.gz chromium_src-0bf0190a99a0ec4ec7906f379bf26f8981d7d05d.tar.bz2 |
Revert 268019 "Add hpack_fuzz_wrapper to chromium_builder_asan."
Broke windows compile:
FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\net\spdy\fuzzing\hpack_fuzz_wrapper.hpack_fuzz_wrapper.obj.rsp /c ..\..\net\spdy\fuzzing\hpack_fuzz_wrapper.cc /Foobj\net\spdy\fuzzing\hpack_fuzz_wrapper.hpack_fuzz_wrapper.obj /Fdobj\net\hpack_fuzz_wrapper.cc.pdb
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_wrapper.cc(38) :error C2440: '<function-style-cast>' : cannot convert from 'std::string' to 'base::FilePath'
No constructor could take the source type, or constructor overload resolution was ambiguous
FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\net\spdy\fuzzing\hpack_example_generator.hpack_example_generator.obj.rsp /c ..\..\net\spdy\fuzzing\hpack_example_generator.cc /Foobj\net\spdy\fuzzing\hpack_example_generator.hpack_example_generator.obj /Fdobj\net\hpack_example_generator.cc.pdb
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_example_generator.cc(51) :error C2440: '<function-style-cast>' : cannot convert from 'std::string' to 'base::FilePath'
No constructor could take the source type, or constructor overload resolution was ambiguous
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_example_generator.cc(52) :error C2664: 'base::File::File(base::File::RValue)' : cannot convert argument 1 from 'int' to 'base::File &'
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_example_generator.cc(68) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_example_generator.cc(69) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
FAILED: ninja -t msvc -e environment.x64 -- C:\b\build\goma\gomacc.exe "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64\cl.exe" /nologo /showIncludes /FC @obj\net\spdy\fuzzing\hpack_fuzz_mutator.hpack_fuzz_mutator.obj.rsp /c ..\..\net\spdy\fuzzing\hpack_fuzz_mutator.cc /Foobj\net\spdy\fuzzing\hpack_fuzz_mutator.hpack_fuzz_mutator.obj /Fdobj\net\hpack_fuzz_mutator.cc.pdb
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_mutator.cc(53) :error C2440: '<function-style-cast>' : cannot convert from 'std::string' to 'base::FilePath'
No constructor could take the source type, or constructor overload resolution was ambiguous
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_mutator.cc(56) :error C2440: '<function-style-cast>' : cannot convert from 'std::string' to 'base::FilePath'
No constructor could take the source type, or constructor overload resolution was ambiguous
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_mutator.cc(57) :error C2664: 'base::File::File(base::File::RValue)' : cannot convert argument 1 from 'int' to 'base::File &'
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_mutator.cc(72) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
c:\b\build\slave\cr-win-rel-x64\build\src\net\spdy\fuzzing\hpack_fuzz_mutator.cc(73) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
> Add hpack_fuzz_wrapper to chromium_builder_asan.
>
> BUG=353237
>
> Review URL: https://codereview.chromium.org/266003005
TBR=jgraettinger@chromium.org
Review URL: https://codereview.chromium.org/268863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r-- | net/net.gyp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/net/net.gyp b/net/net.gyp index 6758a11..49519d4 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1093,39 +1093,6 @@ 'msvs_disabled_warnings': [4267, ], }, { - 'target_name': 'hpack_example_generator', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - 'net', - ], - 'sources': [ - 'spdy/fuzzing/hpack_example_generator.cc', - ], - }, - { - 'target_name': 'hpack_fuzz_mutator', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - 'net', - ], - 'sources': [ - 'spdy/fuzzing/hpack_fuzz_mutator.cc', - ], - }, - { - 'target_name': 'hpack_fuzz_wrapper', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - 'net', - ], - 'sources': [ - 'spdy/fuzzing/hpack_fuzz_wrapper.cc', - ], - }, - { 'target_name': 'net_watcher', 'type': 'executable', 'dependencies': [ @@ -1383,6 +1350,39 @@ 'tools/quic/quic_server_bin.cc', ], }, + { + 'target_name': 'hpack_example_generator', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + 'net', + ], + 'sources': [ + 'spdy/fuzzing/hpack_example_generator.cc', + ], + }, + { + 'target_name': 'hpack_fuzz_mutator', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + 'net', + ], + 'sources': [ + 'spdy/fuzzing/hpack_fuzz_mutator.cc', + ], + }, + { + 'target_name': 'hpack_fuzz_wrapper', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + 'net', + ], + 'sources': [ + 'spdy/fuzzing/hpack_fuzz_wrapper.cc', + ], + } ] }], ['OS=="android"', { |