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

Side by Side Diff: mojo/mojo.gyp

Issue 193403003: Move relevent JS tests to mojo_js_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add back deps Created 6 years, 9 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/bindings/js/run_js_tests.cc ('k') | mojo/mojo_apps.gypi » ('j') | 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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['mojo_shell_debug_url != ""', { 8 ['mojo_shell_debug_url != ""', {
9 'defines': [ 9 'defines': [
10 'MOJO_SHELL_DEBUG=1', 10 'MOJO_SHELL_DEBUG=1',
(...skipping 10 matching lines...) Expand all
21 'mojo_apps.gypi', 21 'mojo_apps.gypi',
22 'mojo_examples.gypi', 22 'mojo_examples.gypi',
23 'mojo_public.gypi', 23 'mojo_public.gypi',
24 'mojo_services.gypi', 24 'mojo_services.gypi',
25 ], 25 ],
26 'targets': [ 26 'targets': [
27 { 27 {
28 'target_name': 'mojo', 28 'target_name': 'mojo',
29 'type': 'none', 29 'type': 'none',
30 'dependencies': [ 30 'dependencies': [
31 'mojo_apps_js_unittests',
31 'mojo_bindings', 32 'mojo_bindings',
32 'mojo_compositor_app', 33 'mojo_compositor_app',
33 'mojo_common_lib', 34 'mojo_common_lib',
34 'mojo_common_unittests', 35 'mojo_common_unittests',
35 'mojo_js', 36 'mojo_js',
36 'mojo_js_unittests', 37 'mojo_js_unittests',
37 'mojo_public_test_utils', 38 'mojo_public_test_utils',
38 'mojo_public_bindings_unittests', 39 'mojo_public_bindings_unittests',
39 'mojo_public_environment_unittests', 40 'mojo_public_environment_unittests',
40 'mojo_public_system_perftests', 41 'mojo_public_system_perftests',
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 'bindings/js/core.cc', 445 'bindings/js/core.cc',
445 'bindings/js/core.h', 446 'bindings/js/core.h',
446 'bindings/js/handle.cc', 447 'bindings/js/handle.cc',
447 'bindings/js/handle.h', 448 'bindings/js/handle.h',
448 'bindings/js/support.cc', 449 'bindings/js/support.cc',
449 'bindings/js/support.h', 450 'bindings/js/support.h',
450 'bindings/js/waiting_callback.cc', 451 'bindings/js/waiting_callback.cc',
451 'bindings/js/waiting_callback.h', 452 'bindings/js/waiting_callback.h',
452 ], 453 ],
453 }, 454 },
455 {
456 'target_name': 'mojo_js_unittests',
457 'type': 'executable',
458 'dependencies': [
459 '../gin/gin.gyp:gin_test',
460 'mojo_js_bindings_lib',
461 'mojo_run_all_unittests',
462 ],
463 'sources': [
464 'bindings/js/run_js_tests.cc',
465 ],
466 },
454 ], 467 ],
455 'conditions': [ 468 'conditions': [
456 ['OS=="android"', { 469 ['OS=="android"', {
457 'targets': [ 470 'targets': [
458 { 471 {
459 'target_name': 'mojo_native_viewport_java', 472 'target_name': 'mojo_native_viewport_java',
460 'type': 'none', 473 'type': 'none',
461 'dependencies': [ 474 'dependencies': [
462 '../base/base.gyp:base_java', 475 '../base/base.gyp:base_java',
463 ], 476 ],
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', 540 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
528 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', 541 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
529 'native_lib_target': 'libmojo_shell', 542 'native_lib_target': 'libmojo_shell',
530 }, 543 },
531 'includes': [ '../build/java_apk.gypi' ], 544 'includes': [ '../build/java_apk.gypi' ],
532 } 545 }
533 ], 546 ],
534 }], 547 }],
535 ], 548 ],
536 } 549 }
OLDNEW
« no previous file with comments | « mojo/bindings/js/run_js_tests.cc ('k') | mojo/mojo_apps.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698