| OLD | NEW |
| 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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 'variables': { | 548 'variables': { |
| 549 'apk_name': 'MojoShell', | 549 'apk_name': 'MojoShell', |
| 550 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', | 550 'java_in_dir': '<(DEPTH)/mojo/shell/android/apk', |
| 551 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', | 551 'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res', |
| 552 'native_lib_target': 'libmojo_shell', | 552 'native_lib_target': 'libmojo_shell', |
| 553 }, | 553 }, |
| 554 'includes': [ '../build/java_apk.gypi' ], | 554 'includes': [ '../build/java_apk.gypi' ], |
| 555 } | 555 } |
| 556 ], | 556 ], |
| 557 }], | 557 }], |
| 558 ['test_isolation_mode != "noop"', { |
| 559 'targets': [ |
| 560 { |
| 561 'target_name': 'mojo_js_unittests_run', |
| 562 'type': 'none', |
| 563 'dependencies': [ |
| 564 'mojo_js_unittests', |
| 565 ], |
| 566 'includes': [ |
| 567 '../build/isolate.gypi', |
| 568 'mojo_js_unittests.isolate', |
| 569 ], |
| 570 'sources': [ |
| 571 'mojo_js_unittests.isolate', |
| 572 ], |
| 573 }, |
| 574 ], |
| 575 }], |
| 558 ], | 576 ], |
| 559 } | 577 } |
| OLD | NEW |