| 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 'variables': { | 10 'variables': { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 '../gpu/gpu.gyp:gpu_unittests', | 72 '../gpu/gpu.gyp:gpu_unittests', |
| 73 '../ipc/ipc.gyp:ipc_tests', | 73 '../ipc/ipc.gyp:ipc_tests', |
| 74 '../media/media.gyp:media_unittests', | 74 '../media/media.gyp:media_unittests', |
| 75 '../net/net.gyp:net_unittests', | 75 '../net/net.gyp:net_unittests', |
| 76 '../sandbox/sandbox.gyp:sandbox_linux_unittests', | 76 '../sandbox/sandbox.gyp:sandbox_linux_unittests', |
| 77 '../sql/sql.gyp:sql_unittests', | 77 '../sql/sql.gyp:sql_unittests', |
| 78 '../sync/sync.gyp:sync_unit_tests', | 78 '../sync/sync.gyp:sync_unit_tests', |
| 79 '../third_party/WebKit/public/all.gyp:*', | 79 '../third_party/WebKit/public/all.gyp:*', |
| 80 '../tools/android/android_tools.gyp:android_tools', | 80 '../tools/android/android_tools.gyp:android_tools', |
| 81 '../tools/android/android_tools.gyp:memconsumer', | 81 '../tools/android/android_tools.gyp:memconsumer', |
| 82 '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s
tats_monitor', | |
| 83 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_te
st', | 82 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_te
st', |
| 84 '../ui/ui.gyp:ui_unittests', | 83 '../ui/ui.gyp:ui_unittests', |
| 85 # Required by ui_unittests. | 84 # Required by ui_unittests. |
| 86 # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but | 85 # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but |
| 87 # this would cause circular gyp dependency which needs refactoring the | 86 # this would cause circular gyp dependency which needs refactoring the |
| 88 # gyps to resolve. | 87 # gyps to resolve. |
| 89 '../chrome/chrome_resources.gyp:packed_resources', | 88 '../chrome/chrome_resources.gyp:packed_resources', |
| 90 ], | 89 ], |
| 91 'conditions': [ | 90 'conditions': [ |
| 92 ['"<(gtest_target_type)"=="shared_library"', { | 91 ['"<(gtest_target_type)"=="shared_library"', { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 { | 145 { |
| 147 # In-progress targets that are expected to fail and are NOT run | 146 # In-progress targets that are expected to fail and are NOT run |
| 148 # on any bot. | 147 # on any bot. |
| 149 'target_name': 'android_in_progress', | 148 'target_name': 'android_in_progress', |
| 150 'type': 'none', | 149 'type': 'none', |
| 151 'dependencies': [ | 150 'dependencies': [ |
| 152 ], | 151 ], |
| 153 }, | 152 }, |
| 154 ], # targets | 153 ], # targets |
| 155 } | 154 } |
| OLD | NEW |