chrome/chrome_tests.gypi - Issue 2001953002: Revert of media: Use platform specific folders for CDMs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_tests.gypi

Issue 2001953002: Revert of 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

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index 3a74f1c6c2b0dd6e0e713d009b0002148c97af7d..658e79ee609618041f561ccbaac15d40877981fc 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -2671,10 +2671,14 @@

'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', {

@@ -3156,8 +3160,6 @@

'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') | no next file with comments »