Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: media/test/BUILD.gn

Issue 941863002: Add more size_t -> int warning fixes for the win x64 GN build. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@fix_win64
Patch Set: remove mojo changes Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//media/media_options.gni") 5 import("//media/media_options.gni")
6 6
7 source_set("pipeline_integration_test_base") { 7 source_set("pipeline_integration_test_base") {
8 testonly = true 8 testonly = true
9 9
10 if (media_use_ffmpeg) { 10 if (media_use_ffmpeg) {
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 27
28 source_set("pipeline_integration_tests") { 28 source_set("pipeline_integration_tests") {
29 testonly = true 29 testonly = true
30 30
31 if (media_use_ffmpeg) { 31 if (media_use_ffmpeg) {
32 sources = [ 32 sources = [
33 "pipeline_integration_test.cc", 33 "pipeline_integration_test.cc",
34 ] 34 ]
35 35
36 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
37
36 deps = [ 38 deps = [
37 ":pipeline_integration_test_base", 39 ":pipeline_integration_test_base",
38 "//base", 40 "//base",
39 "//media", 41 "//media",
40 "//media:test_support", 42 "//media:test_support",
41 "//media/audio:test_support", 43 "//media/audio:test_support",
42 "//media/base:test_support", 44 "//media/base:test_support",
43 "//testing/gtest", 45 "//testing/gtest",
44 46
45 # TODO(dalecurtis): Required since the gmock header is included in the 47 # TODO(dalecurtis): Required since the gmock header is included in the
(...skipping 30 matching lines...) Expand all
76 source_set("mojo_pipeline_integration_tests") { 78 source_set("mojo_pipeline_integration_tests") {
77 testonly = true 79 testonly = true
78 80
79 if (media_use_ffmpeg) { 81 if (media_use_ffmpeg) {
80 sources = [ 82 sources = [
81 "pipeline_integration_test.cc", 83 "pipeline_integration_test.cc",
82 ] 84 ]
83 85
84 defines = [ "MOJO_RENDERER" ] 86 defines = [ "MOJO_RENDERER" ]
85 87
88 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
89
86 deps = [ 90 deps = [
87 ":pipeline_integration_test_base", 91 ":pipeline_integration_test_base",
88 "//base", 92 "//base",
89 "//base/test:test_support", 93 "//base/test:test_support",
90 "//media", 94 "//media",
91 "//media:test_support", 95 "//media:test_support",
92 "//media/audio:test_support", 96 "//media/audio:test_support",
93 "//media/base:test_support", 97 "//media/base:test_support",
94 "//media/mojo/interfaces", 98 "//media/mojo/interfaces",
95 "//media/mojo/services:media", 99 "//media/mojo/services:media",
96 "//media/mojo/services:renderer_proxy", 100 "//media/mojo/services:renderer_proxy",
97 "//media/mojo/services:renderer_service", 101 "//media/mojo/services:renderer_service",
98 "//mojo/application", 102 "//mojo/application",
99 "//mojo/application:test_support", 103 "//mojo/application:test_support",
100 "//testing/gtest", 104 "//testing/gtest",
101 "//ui/gfx/geometry", 105 "//ui/gfx/geometry",
102 "//ui/gfx:test_support", 106 "//ui/gfx:test_support",
103 107
104 # TODO(dalecurtis): Required since the gmock header is included in the 108 # TODO(dalecurtis): Required since the gmock header is included in the
105 # header for pipeline_integration_test_base.h. This should be moved int o 109 # header for pipeline_integration_test_base.h. This should be moved int o
106 # the .cc file to avoid the extra dependency here. 110 # the .cc file to avoid the extra dependency here.
107 "//testing/gmock", 111 "//testing/gmock",
108 ] 112 ]
109 } 113 }
110 } 114 }
111 } 115 }
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698