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

Side by Side Diff: extensions/extensions_tests.gyp

Issue 932063003: Add split tunnel interface to vpnProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits from Benjamin and a build failure Created 5 years, 10 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
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 ['OS=="win" and win_use_allocator_shim==1', { 89 ['OS=="win" and win_use_allocator_shim==1', {
90 'dependencies': [ 90 'dependencies': [
91 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 91 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
92 ], 92 ],
93 }], 93 }],
94 ['OS=="mac"', { 94 ['OS=="mac"', {
95 'dependencies': [ 95 'dependencies': [
96 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helpe r. 96 'shell/app_shell.gyp:app_shell', # Needed for App Shell.app's Helpe r.
97 ], 97 ],
98 }], 98 }],
99 ['chromeos==1', {
100 'sources': [
101 '<@(extensions_browsertests_sources_chromeos)',
102 ],
103 }],
99 # This is only here to keep gyp happy. This target never builds on 104 # This is only here to keep gyp happy. This target never builds on
100 # mobile platforms. 105 # mobile platforms.
101 ['OS != "ios" and OS != "android"', { 106 ['OS != "ios" and OS != "android"', {
102 'dependencies': [ 107 'dependencies': [
103 '<(DEPTH)/components/components.gyp:storage_monitor_test_support', 108 '<(DEPTH)/components/components.gyp:storage_monitor_test_support',
104 ], 109 ],
105 }], 110 }],
106 ] 111 ]
107 }, 112 },
108 ], 113 ],
(...skipping 10 matching lines...) Expand all
119 '../build/isolate.gypi', 124 '../build/isolate.gypi',
120 ], 125 ],
121 'sources': [ 126 'sources': [
122 'extensions_browsertests.isolate', 127 'extensions_browsertests.isolate',
123 ], 128 ],
124 }, 129 },
125 ], 130 ],
126 }], 131 }],
127 ], 132 ],
128 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698