| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # This is all.gyp file for Android to prevent breakage in Android and other | 5 # This is all.gyp file for Android to prevent breakage in Android and other |
| 6 # platform; It will be churning a lot in the short term and eventually be merged | 6 # platform; It will be churning a lot in the short term and eventually be merged |
| 7 # into all.gyp. | 7 # into all.gyp. |
| 8 | 8 |
| 9 { | 9 { |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 # please also add it to build/android/run_tests.py, else the | 22 # please also add it to build/android/run_tests.py, else the |
| 23 # test is not run. | 23 # test is not run. |
| 24 # | 24 # |
| 25 # WARNING: | 25 # WARNING: |
| 26 # Do not add targets here without communicating the implications | 26 # Do not add targets here without communicating the implications |
| 27 # on tryserver triggers and load. Discuss with jrg please. | 27 # on tryserver triggers and load. Discuss with jrg please. |
| 28 'target_name': 'android_builder_tests', | 28 'target_name': 'android_builder_tests', |
| 29 'type': 'none', | 29 'type': 'none', |
| 30 'dependencies': [ | 30 'dependencies': [ |
| 31 '../base/base.gyp:base_unittests', | 31 '../base/base.gyp:base_unittests', |
| 32 '../content/content.gyp:content_shell_test_apk', |
| 32 '../content/content.gyp:content_unittests', | 33 '../content/content.gyp:content_unittests', |
| 33 '../chrome/chrome.gyp:unit_tests', | 34 '../chrome/chrome.gyp:unit_tests', |
| 34 '../gpu/gpu.gyp:gpu_unittests', | 35 '../gpu/gpu.gyp:gpu_unittests', |
| 35 '../sql/sql.gyp:sql_unittests', | 36 '../sql/sql.gyp:sql_unittests', |
| 36 '../sync/sync.gyp:sync_unit_tests', | 37 '../sync/sync.gyp:sync_unit_tests', |
| 37 '../ipc/ipc.gyp:ipc_tests', | 38 '../ipc/ipc.gyp:ipc_tests', |
| 38 '../net/net.gyp:net_unittests', | 39 '../net/net.gyp:net_unittests', |
| 39 '../ui/ui.gyp:ui_unittests', | 40 '../ui/ui.gyp:ui_unittests', |
| 40 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 41 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', |
| 41 # From here down: not added to run_tests.py yet. | 42 # From here down: not added to run_tests.py yet. |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 # In-progress targets that are expected to fail and are NOT run | 88 # In-progress targets that are expected to fail and are NOT run |
| 88 # on any bot. | 89 # on any bot. |
| 89 'target_name': 'android_in_progress', | 90 'target_name': 'android_in_progress', |
| 90 'type': 'none', | 91 'type': 'none', |
| 91 'dependencies': [ | 92 'dependencies': [ |
| 92 '../content/content.gyp:content_browsertests', | 93 '../content/content.gyp:content_browsertests', |
| 93 ], | 94 ], |
| 94 }, | 95 }, |
| 95 ], # targets | 96 ], # targets |
| 96 } | 97 } |
| OLD | NEW |