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

Side by Side Diff: media/media.gyp

Issue 10537082: Remove duplicate CPU detection code; use base::CPU instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: int->bool Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/base/yuv_convert_unittest.cc ('k') | remoting/host/differ_block.cc » ('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 (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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 'sources!': [ 438 'sources!': [
439 'audio/pulse/pulse_output.cc', 439 'audio/pulse/pulse_output.cc',
440 'audio/pulse/pulse_output.h', 440 'audio/pulse/pulse_output.h',
441 'video/capture/video_capture_device_dummy.cc', 441 'video/capture/video_capture_device_dummy.cc',
442 'video/capture/video_capture_device_dummy.h', 442 'video/capture/video_capture_device_dummy.h',
443 ], 443 ],
444 }], 444 }],
445 ], 445 ],
446 }, 446 },
447 { 447 {
448 'target_name': 'cpu_features',
449 'type': 'static_library',
450 'include_dirs': [
451 '..',
452 ],
453 'conditions': [
454 [ 'target_arch == "ia32" or target_arch == "x64"', {
455 'sources': [
456 'base/cpu_features_x86.cc',
457 ],
458 }],
459 [ 'target_arch == "arm"', {
460 'sources': [
461 'base/cpu_features_arm.cc',
462 ],
463 }],
464 ],
465 'sources': [
466 'base/cpu_features.h',
467 ],
468 },
469 {
470 'target_name': 'yuv_convert', 448 'target_name': 'yuv_convert',
471 'type': 'static_library', 449 'type': 'static_library',
472 'include_dirs': [ 450 'include_dirs': [
473 '..', 451 '..',
474 ], 452 ],
475 'dependencies': [
476 'cpu_features',
477 ],
478 'conditions': [ 453 'conditions': [
479 ['order_profiling != 0', { 454 ['order_profiling != 0', {
480 'target_conditions' : [ 455 'target_conditions' : [
481 ['_toolset=="target"', { 456 ['_toolset=="target"', {
482 'cflags!': [ '-finstrument-functions' ], 457 'cflags!': [ '-finstrument-functions' ],
483 }], 458 }],
484 ], 459 ],
485 }], 460 }],
486 [ 'target_arch == "ia32" or target_arch == "x64"', { 461 [ 'target_arch == "ia32" or target_arch == "x64"', {
487 'dependencies': [ 462 'dependencies': [
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1059 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1085 ], 1060 ],
1086 'sources': [ 1061 'sources': [
1087 'tools/media_bench/media_bench.cc', 1062 'tools/media_bench/media_bench.cc',
1088 ], 1063 ],
1089 }, 1064 },
1090 ], 1065 ],
1091 }] 1066 }]
1092 ], 1067 ],
1093 } 1068 }
OLDNEW
« no previous file with comments | « media/base/yuv_convert_unittest.cc ('k') | remoting/host/differ_block.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698