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

Side by Side Diff: extensions/extensions_tests.gyp

Issue 1900233004: [chrome.displaySource] Implement software based H.264 video encoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Check proprietary_codecs 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 | « extensions/extensions.gypi ('k') | extensions/renderer/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'includes': [ 2 'includes': [
3 'extensions_tests.gypi', 3 'extensions_tests.gypi',
4 ], 4 ],
5 'variables': { 5 'variables': {
6 # Product name is used for Mac bundle. 6 # Product name is used for Mac bundle.
7 'app_shell_product_name': 'App Shell', 7 'app_shell_product_name': 'App Shell',
8 # The version is high enough to be supported by Omaha (at least 31) 8 # The version is high enough to be supported by Omaha (at least 31)
9 # but fake enough to be obviously not a Chrome release. 9 # but fake enough to be obviously not a Chrome release.
10 'app_shell_version': '38.1234.5678.9', 10 'app_shell_version': '38.1234.5678.9',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'msvs_disabled_warnings': [ 4267, ], 54 'msvs_disabled_warnings': [ 4267, ],
55 'conditions': [ 55 'conditions': [
56 ['chromeos==1', { 56 ['chromeos==1', {
57 'dependencies': [ 57 'dependencies': [
58 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support', 58 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support',
59 ], 59 ],
60 'sources': [ 60 'sources': [
61 'browser/api/webcam_private/visca_webcam_unittest.cc', 61 'browser/api/webcam_private/visca_webcam_unittest.cc',
62 ], 62 ],
63 }], 63 }],
64 ['enable_wifi_display==1', { 64 ['proprietary_codecs==1 and enable_wifi_display==1', {
65 'sources': [ 65 'sources': [
66 '<@(extensions_unittests_sources_wifi_display)', 66 '<@(extensions_unittests_sources_wifi_display)',
67 ], 67 ],
68 }], 68 }],
69 ], 69 ],
70 }, 70 },
71 { 71 {
72 # GN version: //extensions:extensions_browsertests 72 # GN version: //extensions:extensions_browsertests
73 'target_name': 'extensions_browsertests', 73 'target_name': 'extensions_browsertests',
74 'type': '<(gtest_target_type)', 74 'type': '<(gtest_target_type)',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 'dependencies': [ 146 'dependencies': [
147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
148 ], 148 ],
149 }], 149 }],
150 ], 150 ],
151 } 151 }
152 ], 152 ],
153 }], 153 }],
154 ], 154 ],
155 } 155 }
OLDNEW
« no previous file with comments | « extensions/extensions.gypi ('k') | extensions/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698