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

Side by Side Diff: media/media.gyp

Issue 1989893004: media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: specify both paths in chrome.release Created 4 years, 7 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
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 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 ['include', '^base/mac/corevideo_glue\\.h$'], 1099 ['include', '^base/mac/corevideo_glue\\.h$'],
1100 ['include', '^base/mac/videotoolbox_glue\\.h$'], 1100 ['include', '^base/mac/videotoolbox_glue\\.h$'],
1101 ['include', '^base/mac/videotoolbox_glue\\.mm$'], 1101 ['include', '^base/mac/videotoolbox_glue\\.mm$'],
1102 ['include', '^base/mac/video_frame_mac\\.h$'], 1102 ['include', '^base/mac/video_frame_mac\\.h$'],
1103 ['include', '^base/mac/video_frame_mac\\.cc$'], 1103 ['include', '^base/mac/video_frame_mac\\.cc$'],
1104 ], 1104 ],
1105 }], 1105 }],
1106 ], # target_conditions 1106 ], # target_conditions
1107 }, 1107 },
1108 { 1108 {
1109 # GN version: //media:cdm_paths
1110 'target_name': 'cdm_paths',
1111 'type': 'static_library',
1112 'sources': [
1113 'cdm/cdm_paths.cc',
1114 'cdm/cdm_paths.h',
1115 ],
1116 'dependencies': [
1117 '../base/base.gyp:base',
1118 ]
1119 },
1120 {
1109 # GN version: //media:media_unittests 1121 # GN version: //media:media_unittests
1110 'target_name': 'media_unittests', 1122 'target_name': 'media_unittests',
1111 'type': '<(gtest_target_type)', 1123 'type': '<(gtest_target_type)',
1112 'dependencies': [ 1124 'dependencies': [
1113 'audio_test_config', 1125 'audio_test_config',
1126 'cdm_paths',
1114 'media', 1127 'media',
1115 'media_features', 1128 'media_features',
1116 'media_test_support', 1129 'media_test_support',
1117 'shared_memory_support', 1130 'shared_memory_support',
1118 '../base/base.gyp:base', 1131 '../base/base.gyp:base',
1119 '../base/base.gyp:base_i18n', 1132 '../base/base.gyp:base_i18n',
1120 '../base/base.gyp:test_support_base', 1133 '../base/base.gyp:test_support_base',
1121 '../gpu/gpu.gyp:command_buffer_common', 1134 '../gpu/gpu.gyp:command_buffer_common',
1122 '../gpu/gpu.gyp:gpu_unittest_utils', 1135 '../gpu/gpu.gyp:gpu_unittest_utils',
1123 '../skia/skia.gyp:skia', 1136 '../skia/skia.gyp:skia',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 ], 1333 ],
1321 }], 1334 }],
1322 # If ExternalClearKey is built, we can test CdmAdapter. 1335 # If ExternalClearKey is built, we can test CdmAdapter.
1323 ['enable_pepper_cdms == 1', { 1336 ['enable_pepper_cdms == 1', {
1324 'dependencies': [ 1337 'dependencies': [
1325 'clearkeycdm', 1338 'clearkeycdm',
1326 ], 1339 ],
1327 'sources': [ 1340 'sources': [
1328 'cdm/cdm_adapter_unittest.cc', 1341 'cdm/cdm_adapter_unittest.cc',
1329 ], 1342 ],
1343 'conditions': [
1344 ['OS == "mac"', {
1345 'xcode_settings': {
1346 'LD_RUNPATH_SEARCH_PATHS' : [ '@executable_path/<(clearkey_cdm_p ath)' ],
1347 },
1348 }]
1349 ],
1330 }], 1350 }],
1331 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 1351 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
1332 'sources': [ 1352 'sources': [
1333 'filters/h264_bitstream_buffer_unittest.cc', 1353 'filters/h264_bitstream_buffer_unittest.cc',
1334 ], 1354 ],
1335 }], 1355 }],
1336 ['target_arch=="ia32" or target_arch=="x64"', { 1356 ['target_arch=="ia32" or target_arch=="x64"', {
1337 'sources': [ 1357 'sources': [
1338 'base/simd/convert_rgb_to_yuv_unittest.cc', 1358 'base/simd/convert_rgb_to_yuv_unittest.cc',
1339 ], 1359 ],
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 'dependencies': [ 2310 'dependencies': [
2291 '../build/linux/system.gyp:libdrm', 2311 '../build/linux/system.gyp:libdrm',
2292 ] 2312 ]
2293 }], 2313 }],
2294 ], 2314 ],
2295 } 2315 }
2296 ] 2316 ]
2297 }], 2317 }],
2298 ], 2318 ],
2299 } 2319 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698