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

Side by Side Diff: media/media.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 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 | « media/cast/cast_testing_tools.gypi ('k') | net/BUILD.gn » ('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 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 'test/pipeline_integration_test_base.cc', 1381 'test/pipeline_integration_test_base.cc',
1382 1382
1383 # These tests are confused by Android always having proprietary 1383 # These tests are confused by Android always having proprietary
1384 # codecs enabled, but ffmpeg_branding=Chromium. These should be 1384 # codecs enabled, but ffmpeg_branding=Chromium. These should be
1385 # fixed, see http://crbug.com/570762. 1385 # fixed, see http://crbug.com/570762.
1386 'filters/audio_decoder_unittest.cc', 1386 'filters/audio_decoder_unittest.cc',
1387 'filters/audio_file_reader_unittest.cc', 1387 'filters/audio_file_reader_unittest.cc',
1388 'filters/ffmpeg_demuxer_unittest.cc', 1388 'filters/ffmpeg_demuxer_unittest.cc',
1389 ], 1389 ],
1390 }], 1390 }],
1391
1392 ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_libra ry" and win_use_allocator_shim==1)', {
1393 'conditions': [
1394 ['use_allocator!="none"', {
1395 'dependencies': [
1396 '../base/allocator/allocator.gyp:allocator',
1397 ],
1398 }],
1399 ],
1400 }],
1401 ['OS=="android"', { 1391 ['OS=="android"', {
1402 'dependencies': [ 1392 'dependencies': [
1403 '../testing/android/native_test.gyp:native_test_native_code', 1393 '../testing/android/native_test.gyp:native_test_native_code',
1404 'player_android', 1394 'player_android',
1405 ], 1395 ],
1406 'sources!': [ 1396 'sources!': [
1407 'filters/decrypting_audio_decoder_unittest.cc', 1397 'filters/decrypting_audio_decoder_unittest.cc',
1408 'filters/decrypting_video_decoder_unittest.cc', 1398 'filters/decrypting_video_decoder_unittest.cc',
1409 ], 1399 ],
1410 }], 1400 }],
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 2015 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
2026 '../ui/gfx/gfx.gyp:gfx_geometry', 2016 '../ui/gfx/gfx.gyp:gfx_geometry',
2027 'media', 2017 'media',
2028 'media_test_support', 2018 'media_test_support',
2029 ], 2019 ],
2030 'sources': [ 2020 'sources': [
2031 'base/run_all_unittests.cc', 2021 'base/run_all_unittests.cc',
2032 'ffmpeg/ffmpeg_regression_tests.cc', 2022 'ffmpeg/ffmpeg_regression_tests.cc',
2033 'test/pipeline_integration_test_base.cc', 2023 'test/pipeline_integration_test_base.cc',
2034 ], 2024 ],
2035 'conditions': [
2036 ['os_posix==1 and OS!="mac"', {
2037 'conditions': [
2038 ['use_allocator!="none"', {
2039 'dependencies': [
2040 '../base/allocator/allocator.gyp:allocator',
2041 ],
2042 }],
2043 ],
2044 }],
2045 ],
2046 }, 2025 },
2047 ], 2026 ],
2048 }], 2027 }],
2049 ['OS=="ios"', { 2028 ['OS=="ios"', {
2050 'targets': [ 2029 'targets': [
2051 { 2030 {
2052 # Minimal media component for media/cast on iOS. 2031 # Minimal media component for media/cast on iOS.
2053 # GN version: //media:media_for_cast_ios 2032 # GN version: //media:media_for_cast_ios
2054 'target_name': 'media_for_cast_ios', 2033 'target_name': 'media_for_cast_ios',
2055 'type': '<(component)', 2034 'type': '<(component)',
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
2164 'dependencies': [ 2143 'dependencies': [
2165 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2144 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2166 ], 2145 ],
2167 }], 2146 }],
2168 ], 2147 ],
2169 }, 2148 },
2170 ], 2149 ],
2171 }], 2150 }],
2172 ], 2151 ],
2173 } 2152 }
OLDNEW
« no previous file with comments | « media/cast/cast_testing_tools.gypi ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698