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

Side by Side Diff: media/media.gyp

Issue 1978123002: Revert of media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/cdm/ppapi/BUILD.gn ('k') | media/media_cdm.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 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 ], 1320 ],
1321 }], 1321 }],
1322 # If ExternalClearKey is built, we can test CdmAdapter. 1322 # If ExternalClearKey is built, we can test CdmAdapter.
1323 ['enable_pepper_cdms == 1', { 1323 ['enable_pepper_cdms == 1', {
1324 'dependencies': [ 1324 'dependencies': [
1325 'clearkeycdm', 1325 'clearkeycdm',
1326 ], 1326 ],
1327 'sources': [ 1327 'sources': [
1328 'cdm/cdm_adapter_unittest.cc', 1328 'cdm/cdm_adapter_unittest.cc',
1329 ], 1329 ],
1330 'conditions': [
1331 ['OS == "mac"', {
1332 'xcode_settings': {
1333 'LD_RUNPATH_SEARCH_PATHS' : [ '@executable_path/ClearKeyCdm' ] ,
1334 },
1335 }]
1336 ],
1337 }], 1330 }],
1338 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', { 1331 ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
1339 'sources': [ 1332 'sources': [
1340 'filters/h264_bitstream_buffer_unittest.cc', 1333 'filters/h264_bitstream_buffer_unittest.cc',
1341 ], 1334 ],
1342 }], 1335 }],
1343 ['target_arch=="ia32" or target_arch=="x64"', { 1336 ['target_arch=="ia32" or target_arch=="x64"', {
1344 'sources': [ 1337 'sources': [
1345 'base/simd/convert_rgb_to_yuv_unittest.cc', 1338 'base/simd/convert_rgb_to_yuv_unittest.cc',
1346 ], 1339 ],
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after
2291 'dependencies': [ 2284 'dependencies': [
2292 '../build/linux/system.gyp:libdrm', 2285 '../build/linux/system.gyp:libdrm',
2293 ] 2286 ]
2294 }], 2287 }],
2295 ], 2288 ],
2296 } 2289 }
2297 ] 2290 ]
2298 }], 2291 }],
2299 ], 2292 ],
2300 } 2293 }
OLDNEW
« no previous file with comments | « media/cdm/ppapi/BUILD.gn ('k') | media/media_cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698