| 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 12 matching lines...) Expand all Loading... |
| 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_unittests', | 32 '../content/content.gyp:content_unittests', |
| 33 '../chrome/chrome.gyp:unit_tests', |
| 33 '../gpu/gpu.gyp:gpu_unittests', | 34 '../gpu/gpu.gyp:gpu_unittests', |
| 34 '../sql/sql.gyp:sql_unittests', | 35 '../sql/sql.gyp:sql_unittests', |
| 35 '../sync/sync.gyp:sync_unit_tests', | 36 '../sync/sync.gyp:sync_unit_tests', |
| 36 '../ipc/ipc.gyp:ipc_tests', | 37 '../ipc/ipc.gyp:ipc_tests', |
| 37 '../net/net.gyp:net_unittests', | 38 '../net/net.gyp:net_unittests', |
| 38 '../ui/ui.gyp:ui_unittests', | 39 '../ui/ui.gyp:ui_unittests', |
| 39 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 40 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', |
| 40 # From here down: not added to run_tests.py yet. | 41 # From here down: not added to run_tests.py yet. |
| 41 '../jingle/jingle.gyp:jingle_unittests', | 42 '../jingle/jingle.gyp:jingle_unittests', |
| 42 '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s
tats_monitor', | 43 '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s
tats_monitor', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 53 ['"<(gtest_target_type)"=="shared_library"', { | 54 ['"<(gtest_target_type)"=="shared_library"', { |
| 54 'dependencies': [ | 55 'dependencies': [ |
| 55 # The first item is simply the template. We add as a dep | 56 # The first item is simply the template. We add as a dep |
| 56 # to make sure it builds in ungenerated form. TODO(jrg): | 57 # to make sure it builds in ungenerated form. TODO(jrg): |
| 57 # once stable, transition to a test-only (optional) | 58 # once stable, transition to a test-only (optional) |
| 58 # target. | 59 # target. |
| 59 '../testing/android/native_test.gyp:native_test_apk', | 60 '../testing/android/native_test.gyp:native_test_apk', |
| 60 # Unit test bundles packaged as an apk. | 61 # Unit test bundles packaged as an apk. |
| 61 '../base/base.gyp:base_unittests_apk', | 62 '../base/base.gyp:base_unittests_apk', |
| 62 '../content/content.gyp:content_unittests_apk', | 63 '../content/content.gyp:content_unittests_apk', |
| 64 '../chrome/chrome.gyp:unit_tests_apk', |
| 63 '../gpu/gpu.gyp:gpu_unittests_apk', | 65 '../gpu/gpu.gyp:gpu_unittests_apk', |
| 64 '../sql/sql.gyp:sql_unittests_apk', | 66 '../sql/sql.gyp:sql_unittests_apk', |
| 65 '../sync/sync.gyp:sync_unit_tests_apk', | 67 '../sync/sync.gyp:sync_unit_tests_apk', |
| 66 '../ipc/ipc.gyp:ipc_tests_apk', | 68 '../ipc/ipc.gyp:ipc_tests_apk', |
| 67 '../net/net.gyp:net_unittests_apk', | 69 '../net/net.gyp:net_unittests_apk', |
| 68 '../ui/ui.gyp:ui_unittests_apk', | 70 '../ui/ui.gyp:ui_unittests_apk', |
| 69 ], | 71 ], |
| 70 }] | 72 }] |
| 71 ], | 73 ], |
| 72 }, | 74 }, |
| (...skipping 11 matching lines...) Expand all Loading... |
| 84 # In-progress targets that are expected to fail and are NOT run | 86 # In-progress targets that are expected to fail and are NOT run |
| 85 # on any bot. | 87 # on any bot. |
| 86 'target_name': 'android_in_progress', | 88 'target_name': 'android_in_progress', |
| 87 'type': 'none', | 89 'type': 'none', |
| 88 'dependencies': [ | 90 'dependencies': [ |
| 89 '../content/content.gyp:content_browsertests', | 91 '../content/content.gyp:content_browsertests', |
| 90 ], | 92 ], |
| 91 }, | 93 }, |
| 92 ], # targets | 94 ], # targets |
| 93 } | 95 } |
| OLD | NEW |