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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | chrome/installer/linux/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 658e79ee609618041f561ccbaac15d40877981fc..3a74f1c6c2b0dd6e0e713d009b0002148c97af7d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2671,14 +2671,10 @@
'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
}],
['enable_pepper_cdms==1', {
- 'sources' : [
- 'browser/media/pepper_cdm_test_helper.cc',
- 'browser/media/pepper_cdm_test_helper.h',
- ],
'dependencies': [
# Runtime dependencies.
- '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
'../media/media.gyp:clearkeycdmadapter',
+ '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
],
}],
['enable_print_preview==0', {
@@ -3160,6 +3156,8 @@
'conditions': [
['enable_pepper_cdms==1', {
'dependencies': [
+ 'test_support_common',
+ '../media/media.gyp:cdm_paths',
# Runtime dependencies.
'../media/media.gyp:clearkeycdmadapter',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | chrome/installer/linux/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698