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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: 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 side-by-side diff with in-line comments
Download patch
« media/cdm/ppapi/cdm_paths.gni ('K') | « media/cdm_paths.gypi ('k') | media/media_cdm.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 573e4bd62b2d40ddc2b4d1aa5397198a75866d5f..e982c5e6c50d5bfddce8f417c6991838b892bc34 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -487,6 +487,8 @@
'cdm/cdm_file_io.h',
'cdm/cdm_helpers.cc',
'cdm/cdm_helpers.h',
+ 'cdm/cdm_paths.cc',
+ 'cdm/cdm_paths.h',
'cdm/default_cdm_factory.cc',
'cdm/default_cdm_factory.h',
'cdm/json_web_key.cc',
@@ -1327,6 +1329,13 @@
'sources': [
'cdm/cdm_adapter_unittest.cc',
],
+ 'conditions': [
+ ['OS == "mac"', {
+ 'xcode_settings': {
+ 'LD_RUNPATH_SEARCH_PATHS' : [ '@executable_path/<(clearkey_cdm_path)' ],
+ },
+ }]
+ ],
}],
['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
'sources': [
« media/cdm/ppapi/cdm_paths.gni ('K') | « media/cdm_paths.gypi ('k') | media/media_cdm.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698