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

Side by Side Diff: media/media.gyp

Issue 198333004: Move ui.gyp into ui/base/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASED Created 6 years, 9 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 | « gpu/gles2_conform_support/gles2_conform_support.gyp ('k') | mojo/mojo_examples.gypi » ('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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 'media_test_support', 911 'media_test_support',
912 'shared_memory_support', 912 'shared_memory_support',
913 '../base/base.gyp:base', 913 '../base/base.gyp:base',
914 '../base/base.gyp:base_i18n', 914 '../base/base.gyp:base_i18n',
915 '../base/base.gyp:test_support_base', 915 '../base/base.gyp:test_support_base',
916 '../gpu/gpu.gyp:command_buffer_common', 916 '../gpu/gpu.gyp:command_buffer_common',
917 '../skia/skia.gyp:skia', 917 '../skia/skia.gyp:skia',
918 '../testing/gmock.gyp:gmock', 918 '../testing/gmock.gyp:gmock',
919 '../testing/gtest.gyp:gtest', 919 '../testing/gtest.gyp:gtest',
920 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 920 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
921 '../ui/base/ui_base.gyp:ui_base',
921 '../ui/gfx/gfx.gyp:gfx', 922 '../ui/gfx/gfx.gyp:gfx',
922 '../ui/gfx/gfx.gyp:gfx_geometry', 923 '../ui/gfx/gfx.gyp:gfx_geometry',
923 '../ui/ui.gyp:ui',
924 ], 924 ],
925 'sources': [ 925 'sources': [
926 'audio/android/audio_android_unittest.cc', 926 'audio/android/audio_android_unittest.cc',
927 'audio/alsa/alsa_output_unittest.cc', 927 'audio/alsa/alsa_output_unittest.cc',
928 'audio/audio_input_controller_unittest.cc', 928 'audio/audio_input_controller_unittest.cc',
929 'audio/audio_input_unittest.cc', 929 'audio/audio_input_unittest.cc',
930 'audio/audio_input_volume_unittest.cc', 930 'audio/audio_input_volume_unittest.cc',
931 'audio/audio_low_latency_input_output_unittest.cc', 931 'audio/audio_low_latency_input_output_unittest.cc',
932 'audio/audio_manager_unittest.cc', 932 'audio/audio_manager_unittest.cc',
933 'audio/audio_output_controller_unittest.cc', 933 'audio/audio_output_controller_unittest.cc',
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 # http://crbug.com/171009 1160 # http://crbug.com/171009
1161 ['OS=="win" and target_arch=="x64"', { 1161 ['OS=="win" and target_arch=="x64"', {
1162 'msvs_disabled_warnings': [ 4267, ], 1162 'msvs_disabled_warnings': [ 4267, ],
1163 }], 1163 }],
1164 ], 1164 ],
1165 }, 1165 },
1166 { 1166 {
1167 'target_name': 'media_perftests', 1167 'target_name': 'media_perftests',
1168 'type': '<(gtest_target_type)', 1168 'type': '<(gtest_target_type)',
1169 'dependencies': [ 1169 'dependencies': [
1170 'media',
1171 'media_test_support',
1172 'shared_memory_support',
1173 '../base/base.gyp:test_support_base', 1170 '../base/base.gyp:test_support_base',
1174 '../testing/gmock.gyp:gmock', 1171 '../testing/gmock.gyp:gmock',
1175 '../testing/gtest.gyp:gtest', 1172 '../testing/gtest.gyp:gtest',
1176 '../testing/perf/perf_test.gyp:perf_test', 1173 '../testing/perf/perf_test.gyp:perf_test',
1174 '../ui/base/ui_base.gyp:ui_base',
1177 '../ui/gfx/gfx.gyp:gfx', 1175 '../ui/gfx/gfx.gyp:gfx',
1178 '../ui/gfx/gfx.gyp:gfx_geometry', 1176 '../ui/gfx/gfx.gyp:gfx_geometry',
1179 '../ui/gl/gl.gyp:gl', 1177 '../ui/gl/gl.gyp:gl',
1180 '../ui/ui.gyp:ui', 1178 'media',
1179 'media_test_support',
1180 'shared_memory_support',
1181 ], 1181 ],
1182 'sources': [ 1182 'sources': [
1183 'base/audio_bus_perftest.cc', 1183 'base/audio_bus_perftest.cc',
1184 'base/audio_converter_perftest.cc', 1184 'base/audio_converter_perftest.cc',
1185 'base/demuxer_perftest.cc', 1185 'base/demuxer_perftest.cc',
1186 'base/run_all_perftests.cc', 1186 'base/run_all_perftests.cc',
1187 'base/sinc_resampler_perftest.cc', 1187 'base/sinc_resampler_perftest.cc',
1188 'base/vector_math_perftest.cc', 1188 'base/vector_math_perftest.cc',
1189 'filters/pipeline_integration_perftest.cc', 1189 'filters/pipeline_integration_perftest.cc',
1190 'filters/pipeline_integration_test_base.cc', 1190 'filters/pipeline_integration_test_base.cc',
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 ], 1693 ],
1694 }], 1694 }],
1695 ], 1695 ],
1696 }], 1696 }],
1697 ], 1697 ],
1698 }, 1698 },
1699 ], 1699 ],
1700 }], 1700 }],
1701 ], 1701 ],
1702 } 1702 }
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/gles2_conform_support.gyp ('k') | mojo/mojo_examples.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698