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

Side by Side Diff: mojo/mojo_services.gypi

Issue 256133002: Changes view manager test to connect via shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk Created 6 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 | Annotate | Revision Log
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/service_manager/service_manager.h » ('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 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'mojo_echo_bindings', 4 'target_name': 'mojo_echo_bindings',
5 'type': 'static_library', 5 'type': 'static_library',
6 'sources': [ 6 'sources': [
7 'services/dbus_echo/echo.mojom', 7 'services/dbus_echo/echo.mojom',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'mojom_base_output_dir': 'mojo', 10 'mojom_base_output_dir': 'mojo',
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 ], 209 ],
210 'defines': [ 210 'defines': [
211 'MOJO_VIEW_MANAGER_IMPLEMENTATION', 211 'MOJO_VIEW_MANAGER_IMPLEMENTATION',
212 ], 212 ],
213 }, 213 },
214 { 214 {
215 'target_name': 'mojo_view_manager_unittests', 215 'target_name': 'mojo_view_manager_unittests',
216 'type': 'executable', 216 'type': 'executable',
217 'dependencies': [ 217 'dependencies': [
218 '../base/base.gyp:base', 218 '../base/base.gyp:base',
219 '../base/base.gyp:run_all_unittests',
219 '../skia/skia.gyp:skia', 220 '../skia/skia.gyp:skia',
220 '../testing/gtest.gyp:gtest', 221 '../testing/gtest.gyp:gtest',
221 '../ui/aura/aura.gyp:aura', 222 '../ui/aura/aura.gyp:aura',
222 'mojo_environment_chromium', 223 'mojo_environment_chromium',
223 'mojo_run_all_unittests',
224 'mojo_shell_client', 224 'mojo_shell_client',
225 'mojo_shell_test_support',
225 'mojo_system_impl', 226 'mojo_system_impl',
226 'mojo_view_manager',
227 'mojo_view_manager_bindings', 227 'mojo_view_manager_bindings',
228 ], 228 ],
229 'sources': [ 229 'sources': [
230 'services/view_manager/view_manager_connection_unittest.cc', 230 'services/view_manager/view_manager_connection_unittest.cc',
231 ], 231 ],
232 }, 232 },
233 { 233 {
234 'target_name': 'package_mojo_view_manager', 234 'target_name': 'package_mojo_view_manager',
235 'variables': { 235 'variables': {
236 'app_name': 'mojo_view_manager', 236 'app_name': 'mojo_view_manager',
(...skipping 19 matching lines...) Expand all
256 'mojo_system_impl', 256 'mojo_system_impl',
257 ], 257 ],
258 'sources': [ 258 'sources': [
259 'services/dbus_echo/dbus_echo_service.cc', 259 'services/dbus_echo/dbus_echo_service.cc',
260 ], 260 ],
261 }, 261 },
262 ], 262 ],
263 }], 263 }],
264 ], 264 ],
265 } 265 }
OLDNEW
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/service_manager/service_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698