diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-20 15:36:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 23:36:45 +0000 |
| commit | 8ec93a3ac28c857ae106a2c1929cc935ab76ec03 (patch) | |
| tree | c6d8c0858205085750f95528be23b5929b9b2e36 /media | |
| parent | 910b20ffea23a9fc06052a7ed3bcc4086f5159b5 (diff) | |
| download | chromium_src-8ec93a3ac28c857ae106a2c1929cc935ab76ec03.zip chromium_src-8ec93a3ac28c857ae106a2c1929cc935ab76ec03.tar.gz chromium_src-8ec93a3ac28c857ae106a2c1929cc935ab76ec03.tar.bz2 | |
Add more size_t -> int warning fixes for the win x64 GN build.
R=brettw@chromium.org
BUG=354261
Review URL: https://codereview.chromium.org/941863002
Cr-Commit-Position: refs/heads/master@{#317439}
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/BUILD.gn | 6 | ||||
| -rw-r--r-- | media/base/BUILD.gn | 10 | ||||
| -rw-r--r-- | media/blink/BUILD.gn | 2 | ||||
| -rw-r--r-- | media/mojo/services/BUILD.gn | 2 | ||||
| -rw-r--r-- | media/test/BUILD.gn | 4 |
5 files changed, 21 insertions, 3 deletions
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn index 028fd45..fc0f991 100644 --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -286,7 +286,11 @@ source_set("unittests") { "//testing/gmock", "//testing/gtest", ] - configs += [ "//media:media_config" ] + + configs += [ + "//build/config/compiler:no_size_t_to_int_warning", + "//media:media_config", + ] if (is_android) { sources += [ "android/audio_android_unittest.cc" ] diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn index 4a327bf..b93ed70 100644 --- a/media/base/BUILD.gn +++ b/media/base/BUILD.gn @@ -270,7 +270,10 @@ source_set("base_for_cast_ios") { "video_frame.cc", "video_frame.h", ] - configs += [ "//media:media_config" ] + configs += [ + "//build/config/compiler:no_size_t_to_int_warning", + "//media:media_config", + ] all_dependent_configs = [ ":base_for_cast_ios_dependent_config" ] } @@ -351,7 +354,10 @@ source_set("unittests") { "wall_clock_time_source_unittest.cc", "yuv_convert_unittest.cc", ] - configs += [ "//media:media_config" ] + configs += [ + "//build/config/compiler:no_size_t_to_int_warning", + "//media:media_config", + ] deps = [ ":base", ":test_support", diff --git a/media/blink/BUILD.gn b/media/blink/BUILD.gn index 48dd8dc..bb52f5e 100644 --- a/media/blink/BUILD.gn +++ b/media/blink/BUILD.gn @@ -104,6 +104,8 @@ if (!is_mac && (!is_win || link_chrome_on_windows)) { "//url", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + sources = [ "buffered_data_source_host_impl_unittest.cc", "buffered_data_source_unittest.cc", diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn index c66c649..30e4957 100644 --- a/media/mojo/services/BUILD.gn +++ b/media/mojo/services/BUILD.gn @@ -75,6 +75,8 @@ source_set("cdm_service") { "mojo_cdm_service.h", "mojo_type_trait.h", ] + + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } # media::Renderer implementation using mojo::MediaRenderer. diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn index 1337e9e..60849c1 100644 --- a/media/test/BUILD.gn +++ b/media/test/BUILD.gn @@ -33,6 +33,8 @@ source_set("pipeline_integration_tests") { "pipeline_integration_test.cc", ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":pipeline_integration_test_base", "//base", @@ -83,6 +85,8 @@ if (!is_component_build) { defines = [ "MOJO_RENDERER" ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + deps = [ ":pipeline_integration_test_base", "//base", |