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

Side by Side Diff: mojo/mojo.gyp

Issue 120083002: Remove direct dependency of mojo_shell_lib on mojo_native_viewport_service (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'mojo_apps.gypi', 10 'mojo_apps.gypi',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 }], 242 }],
243 ], 243 ],
244 }, 244 },
245 { 245 {
246 'target_name': 'mojo_shell_lib', 246 'target_name': 'mojo_shell_lib',
247 'type': 'static_library', 247 'type': 'static_library',
248 'dependencies': [ 248 'dependencies': [
249 '../base/base.gyp:base', 249 '../base/base.gyp:base',
250 '../net/net.gyp:net', 250 '../net/net.gyp:net',
251 '../url/url.gyp:url_lib', 251 '../url/url.gyp:url_lib',
252 'mojo_bindings',
253 'mojo_gles2_impl', 252 'mojo_gles2_impl',
254 'mojo_native_viewport_service',
255 'mojo_shell_bindings', 253 'mojo_shell_bindings',
256 'mojo_system', 254 'mojo_system',
257 'mojo_system_impl', 255 'mojo_system_impl',
258 ], 256 ],
259 'sources': [ 257 'sources': [
260 'shell/context.cc', 258 'shell/context.cc',
261 'shell/context.h', 259 'shell/context.h',
262 'shell/init.cc', 260 'shell/init.cc',
263 'shell/init.h', 261 'shell/init.h',
264 'shell/loader.cc', 262 'shell/loader.cc',
265 'shell/loader.h', 263 'shell/loader.h',
266 'shell/network_delegate.cc', 264 'shell/network_delegate.cc',
267 'shell/network_delegate.h', 265 'shell/network_delegate.h',
268 'shell/run.cc', 266 'shell/run.cc',
269 'shell/run.h', 267 'shell/run.h',
268 'shell/service_manager.cc',
269 'shell/service_manager.h',
270 'shell/storage.cc', 270 'shell/storage.cc',
271 'shell/storage.h', 271 'shell/storage.h',
272 'shell/service_manager.cc',
273 'shell/service_manager.h',
274 'shell/switches.cc', 272 'shell/switches.cc',
275 'shell/switches.h', 273 'shell/switches.h',
276 'shell/task_runners.cc', 274 'shell/task_runners.cc',
277 'shell/task_runners.h', 275 'shell/task_runners.h',
278 'shell/url_request_context_getter.cc', 276 'shell/url_request_context_getter.cc',
279 'shell/url_request_context_getter.h', 277 'shell/url_request_context_getter.h',
280 ], 278 ],
281 'conditions': [ 279 'conditions': [
282 ['OS == "win"', { 280 ['OS == "win"', {
283 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 281 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 'target_name': 'libmojo_shell', 364 'target_name': 'libmojo_shell',
367 'type': 'shared_library', 365 'type': 'shared_library',
368 'dependencies': [ 366 'dependencies': [
369 '../base/base.gyp:base', 367 '../base/base.gyp:base',
370 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations', 368 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations',
371 '../ui/gfx/gfx.gyp:gfx', 369 '../ui/gfx/gfx.gyp:gfx',
372 '../ui/gfx/gfx.gyp:gfx_geometry', 370 '../ui/gfx/gfx.gyp:gfx_geometry',
373 '../ui/gl/gl.gyp:gl', 371 '../ui/gl/gl.gyp:gl',
374 'mojo_common_lib', 372 'mojo_common_lib',
375 'mojo_jni_headers', 373 'mojo_jni_headers',
374 'mojo_native_viewport_service',
375 'mojo_shell_bindings',
376 'mojo_shell_lib', 376 'mojo_shell_lib',
377 'mojo_shell_bindings',
378 'mojo_native_viewport_service',
379 ], 377 ],
380 'sources': [ 378 'sources': [
381 'shell/android/library_loader.cc', 379 'shell/android/library_loader.cc',
382 'shell/android/mojo_main.cc', 380 'shell/android/mojo_main.cc',
383 'shell/android/mojo_main.h', 381 'shell/android/mojo_main.h',
384 ], 382 ],
385 }, 383 },
386 { 384 {
387 'target_name': 'mojo_shell_apk', 385 'target_name': 'mojo_shell_apk',
388 'type': 'none', 386 'type': 'none',
389 'dependencies': [ 387 'dependencies': [
390 '../base/base.gyp:base_java', 388 '../base/base.gyp:base_java',
391 '../net/net.gyp:net_java', 389 '../net/net.gyp:net_java',
392 'mojo_native_viewport_java', 390 'mojo_native_viewport_java',
393 'libmojo_shell', 391 'libmojo_shell',
394 ], 392 ],
395 'variables': { 393 'variables': {
396 'apk_name': 'MojoShell', 394 'apk_name': 'MojoShell',
397 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', 395 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
398 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', 396 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
399 'native_lib_target': 'libmojo_shell', 397 'native_lib_target': 'libmojo_shell',
400 }, 398 },
401 'includes': [ '../build/java_apk.gypi' ], 399 'includes': [ '../build/java_apk.gypi' ],
402 } 400 }
403 ], 401 ],
404 }], 402 }],
405 ], 403 ],
406 } 404 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698