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

Side by Side Diff: webrtc/media/media.gyp

Issue 2228733004: Skip unit test if GYP_DEFINES="rtc_use_h264=1" is not set. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: add #define to gyp and gn 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/media/engine/webrtcvideoengine2_unittest.cc ('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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 '-Wno-sign-compare', 284 '-Wno-sign-compare',
285 ], 285 ],
286 'cflags_cc!': [ 286 'cflags_cc!': [
287 '-Woverloaded-virtual', 287 '-Woverloaded-virtual',
288 ], 288 ],
289 'msvs_disabled_warnings': [ 289 'msvs_disabled_warnings': [
290 4245, # conversion from 'int' to 'uint32_t', signed/unsigned mismat ch. 290 4245, # conversion from 'int' to 'uint32_t', signed/unsigned mismat ch.
291 4389, # signed/unsigned mismatch. 291 4389, # signed/unsigned mismatch.
292 ], 292 ],
293 'conditions': [ 293 'conditions': [
294 ['rtc_use_h264==1', {
295 'defines': [
296 'WEBRTC_USE_H264'
297 ]
298 }],
294 ['OS=="win"', { 299 ['OS=="win"', {
295 'msvs_settings': { 300 'msvs_settings': {
296 'VCLinkerTool': { 301 'VCLinkerTool': {
297 'AdditionalDependencies': [ 302 'AdditionalDependencies': [
298 # TODO(ronghuawu): Since we've included strmiids in 303 # TODO(ronghuawu): Since we've included strmiids in
299 # libjingle_media target, we shouldn't need this here. 304 # libjingle_media target, we shouldn't need this here.
300 # Find out why it doesn't work without this. 305 # Find out why it doesn't work without this.
301 'strmiids.lib', 306 'strmiids.lib',
302 ], 307 ],
303 }, 308 },
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 'sources': [ 359 'sources': [
355 'rtc_media_unittests.isolate', 360 'rtc_media_unittests.isolate',
356 ], 361 ],
357 }, 362 },
358 ], 363 ],
359 }], 364 }],
360 ], # conditions 365 ], # conditions
361 }], # include_tests==1 366 }], # include_tests==1
362 ], # conditions 367 ], # conditions
363 } 368 }
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698