diff options
| author | brettw <brettw@chromium.org> | 2015-04-21 09:19:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-21 16:20:17 +0000 |
| commit | 690c9667354a606a9b899e5e2a282127c2057db8 (patch) | |
| tree | c68f43a45d83543adfeeb8cee41607d39f1f0d62 /remoting | |
| parent | ca726326c06b936d05106abde28bbc0f66b81e9d (diff) | |
| download | chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.zip chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.tar.gz chromium_src-690c9667354a606a9b899e5e2a282127c2057db8.tar.bz2 | |
Windows GN tests, webcrypto warnings
Enables many GN Windows tests.
The GN build wasn't disabling the size_t to int warning in webcrypto. I decided to fix the warnings rather than disable them. This code is a random mishmash of size_t, int, unsigned, and long (partially due to third party code). In this change, I tried to do something minimal and clear: some variables were changed to size_t, while some were converted to casts.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg
TBR=dpranke
Review URL: https://codereview.chromium.org/1091293003
Cr-Commit-Position: refs/heads/master@{#326046}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/BUILD.gn | 6 | ||||
| -rw-r--r-- | remoting/base/BUILD.gn | 23 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 1 |
3 files changed, 25 insertions, 5 deletions
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index 8409632..a7c9e247 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -136,10 +136,8 @@ source_set("test_support") { } } -# TODO(GYP) remoting_unittests on Mac/Windows. Currently this fails with a -# duplicate resource error on linking on Windows. Just needs to be checked on -# Mac. -if (!is_win && !is_mac) { +# TODO(GYP) remoting_unittests on Mac. Needs to be tested. +if (!is_mac) { test("remoting_unittests") { # Sources not included in one of the more specific unit_tests deps. sources = [ diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn index bb79d52..48f40ef 100644 --- a/remoting/base/BUILD.gn +++ b/remoting/base/BUILD.gn @@ -29,6 +29,27 @@ source_set("base") { ] } +source_set("breakpad") { + sources = [ + "breakpad.h", + "breakpad_linux.cc", + "breakpad_mac.mm", + "breakpad_win.cc", + ] + + configs += [ "//build/config/compiler:wexit_time_destructors" ] + + deps = [ + "//base", + ] + + if (is_mac) { + deps += [ "//breakpad" ] + } else if (is_win) { + deps += [ "//breakpad:breakpad_handler" ] + } +} + source_set("unit_tests") { testonly = true @@ -50,6 +71,7 @@ source_set("unit_tests") { deps = [ ":base", + ":breakpad", "//base", "//net:test_support", "//testing/gmock", @@ -62,5 +84,4 @@ source_set("unit_tests") { sources += [ "resources_unittest.cc" ] deps += [ "//breakpad:client" ] } - } diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6d783c2..d4f1764 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -84,6 +84,7 @@ 'targets': [ { + # GN version: //remoting/base:breakpad 'target_name': 'remoting_breakpad', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, |