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

Side by Side Diff: media/media.gyp

Issue 12334037: ffmpeg_unittests should depend on use_ffmpeg==1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 | « no previous file | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 '../base/base.gyp:base', 1385 '../base/base.gyp:base',
1386 ], 1386 ],
1387 'variables': { 1387 'variables': {
1388 'java_in_dir': 'base/android/java', 1388 'java_in_dir': 'base/android/java',
1389 }, 1389 },
1390 'includes': [ '../build/java.gypi' ], 1390 'includes': [ '../build/java.gypi' ],
1391 }, 1391 },
1392 1392
1393 ], 1393 ],
1394 }], 1394 }],
1395 ['OS != "android" and OS != "ios"', { 1395 ['use_ffmpeg == 1', {
1396 # Android and iOS do not use ffmpeg, so disable the targets which require
1397 # it.
1398 'targets': [ 1396 'targets': [
1399 { 1397 {
1400 'target_name': 'ffmpeg_unittests', 1398 'target_name': 'ffmpeg_unittests',
1401 'type': 'executable', 1399 'type': 'executable',
1402 'dependencies': [ 1400 'dependencies': [
1403 '../base/base.gyp:base', 1401 '../base/base.gyp:base',
1404 '../base/base.gyp:base_i18n', 1402 '../base/base.gyp:base_i18n',
1405 '../base/base.gyp:test_support_base', 1403 '../base/base.gyp:test_support_base',
1406 '../base/base.gyp:test_support_perf', 1404 '../base/base.gyp:test_support_perf',
1407 '../testing/gtest.gyp:gtest', 1405 '../testing/gtest.gyp:gtest',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
1507 ], 1505 ],
1508 'sources': [ 1506 'sources': [
1509 'video/capture/screen/differ_block_sse2.cc', 1507 'video/capture/screen/differ_block_sse2.cc',
1510 'video/capture/screen/differ_block_sse2.h', 1508 'video/capture/screen/differ_block_sse2.h',
1511 ], 1509 ],
1512 }, # end of target differ_block_sse2 1510 }, # end of target differ_block_sse2
1513 ], 1511 ],
1514 }], 1512 }],
1515 ], 1513 ],
1516 } 1514 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698