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

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

Issue 2257753002: GN: Fix errors when some variables are set to non-default values. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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 | « webrtc/base/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("../build/webrtc.gni") 10 import("../build/webrtc.gni")
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 135
136 if (is_win) { 136 if (is_win) {
137 cflags = [ 137 cflags = [
138 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch. 138 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch.
139 "/wd4267", # conversion from "size_t" to "int", possible loss of data. 139 "/wd4267", # conversion from "size_t" to "int", possible loss of data.
140 "/wd4389", # signed/unsigned mismatch. 140 "/wd4389", # signed/unsigned mismatch.
141 ] 141 ]
142 } 142 }
143 143
144 include_dirs = []
144 if (rtc_build_libyuv) { 145 if (rtc_build_libyuv) {
145 deps += [ "$rtc_libyuv_dir" ] 146 deps += [ "$rtc_libyuv_dir" ]
146 public_deps = [ 147 public_deps = [
147 "$rtc_libyuv_dir", 148 "$rtc_libyuv_dir",
148 ] 149 ]
149 } else { 150 } else {
150 # Need to add a directory normally exported by libyuv. 151 # Need to add a directory normally exported by libyuv.
151 include_dirs += [ "$rtc_libyuv_dir/include" ] 152 include_dirs += [ "$rtc_libyuv_dir/include" ]
152 } 153 }
153 154
154 if (rtc_build_usrsctp) { 155 if (rtc_build_usrsctp) {
155 include_dirs = [ 156 include_dirs += [
156 # TODO(jiayl): move this into the public_configs of 157 # TODO(jiayl): move this into the public_configs of
157 # //third_party/usrsctp/BUILD.gn. 158 # //third_party/usrsctp/BUILD.gn.
158 "//third_party/usrsctp/usrsctplib", 159 "//third_party/usrsctp/usrsctplib",
159 ] 160 ]
160 deps += [ "//third_party/usrsctp" ] 161 deps += [ "//third_party/usrsctp" ]
161 } 162 }
162 163
163 if (build_with_chromium) { 164 if (build_with_chromium) {
164 deps += [ "../modules/video_capture:video_capture" ] 165 deps += [ "../modules/video_capture:video_capture" ]
165 } else { 166 } else {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 # adds -Wall, and this flag have to be after -Wall -- so they need to 216 # adds -Wall, and this flag have to be after -Wall -- so they need to
216 # come from a config and can"t be on the target directly. 217 # come from a config and can"t be on the target directly.
217 if (is_clang && is_ios) { 218 if (is_clang && is_ios) {
218 cflags = [ "-Wno-unused-variable" ] 219 cflags = [ "-Wno-unused-variable" ]
219 } 220 }
220 } 221 }
221 222
222 source_set("rtc_unittest_main") { 223 source_set("rtc_unittest_main") {
223 testonly = true 224 testonly = true
224 225
226 include_dirs = []
227 public_deps = []
225 deps = [] 228 deps = []
226 sources = [ 229 sources = [
227 "base/fakemediaengine.h", 230 "base/fakemediaengine.h",
228 "base/fakenetworkinterface.h", 231 "base/fakenetworkinterface.h",
229 "base/fakertp.h", 232 "base/fakertp.h",
230 "base/fakevideocapturer.h", 233 "base/fakevideocapturer.h",
231 "base/fakevideorenderer.h", 234 "base/fakevideorenderer.h",
232 "base/test/mock_mediachannel.h", 235 "base/test/mock_mediachannel.h",
233 "base/testutils.cc", 236 "base/testutils.cc",
234 "base/testutils.h", 237 "base/testutils.h",
235 "engine/fakewebrtccall.cc", 238 "engine/fakewebrtccall.cc",
236 "engine/fakewebrtccall.h", 239 "engine/fakewebrtccall.h",
237 "engine/fakewebrtccommon.h", 240 "engine/fakewebrtccommon.h",
238 "engine/fakewebrtcdeviceinfo.h", 241 "engine/fakewebrtcdeviceinfo.h",
239 "engine/fakewebrtcvcmfactory.h", 242 "engine/fakewebrtcvcmfactory.h",
240 "engine/fakewebrtcvideocapturemodule.h", 243 "engine/fakewebrtcvideocapturemodule.h",
241 "engine/fakewebrtcvideoengine.h", 244 "engine/fakewebrtcvideoengine.h",
242 "engine/fakewebrtcvoiceengine.h", 245 "engine/fakewebrtcvoiceengine.h",
243 ] 246 ]
244 247
245 configs += [ 248 configs += [
246 "..:common_config", 249 "..:common_config",
247 ":rtc_unittest_main_config", 250 ":rtc_unittest_main_config",
248 ] 251 ]
249 public_configs = [ "..:common_inherited_config" ] 252 public_configs = [ "..:common_inherited_config" ]
250 253
251 if (rtc_build_libyuv) { 254 if (rtc_build_libyuv) {
252 deps += [ "$rtc_libyuv_dir" ] 255 deps += [ "$rtc_libyuv_dir" ]
253 public_deps = [ 256 public_deps += [ "$rtc_libyuv_dir" ]
254 "$rtc_libyuv_dir",
255 ]
256 } else { 257 } else {
257 # Need to add a directory normally exported by libyuv. 258 # Need to add a directory normally exported by libyuv.
258 include_dirs += [ "$rtc_libyuv_dir/include" ] 259 include_dirs += [ "$rtc_libyuv_dir/include" ]
259 } 260 }
260 261
261 if (is_clang) { 262 if (is_clang) {
262 # Suppress warnings from the Chromium Clang plugin. 263 # Suppress warnings from the Chromium Clang plugin.
263 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 264 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
264 configs -= [ "//build/config/clang:find_bad_constructs" ] 265 configs -= [ "//build/config/clang:find_bad_constructs" ]
265 } 266 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 deps += [ 357 deps += [
357 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. 358 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
358 ":rtc_media", 359 ":rtc_media",
359 ":rtc_unittest_main", 360 ":rtc_unittest_main",
360 "../audio", 361 "../audio",
361 "../base:rtc_base_tests_utils", 362 "../base:rtc_base_tests_utils",
362 "../system_wrappers:metrics_default", 363 "../system_wrappers:metrics_default",
363 ] 364 ]
364 } 365 }
365 } 366 }
OLDNEW
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698