| 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': [ |
| 11 { | 11 { |
| 12 'target_name': 'All', | 12 'target_name': 'All', |
| 13 'type': 'none', | 13 'type': 'none', |
| 14 'dependencies': [ | 14 'dependencies': [ |
| 15 '../content/content.gyp:content_shell_apk', |
| 15 'util/build_util.gyp:*', | 16 'util/build_util.gyp:*', |
| 16 'android_builder_tests', | 17 'android_builder_tests', |
| 17 ], | 18 ], |
| 18 }, # target_name: All | 19 }, # target_name: All |
| 19 { | 20 { |
| 20 # The current list of tests for android. This is temporary | 21 # The current list of tests for android. This is temporary |
| 21 # until the full set supported. If adding a new test here, | 22 # until the full set supported. If adding a new test here, |
| 22 # please also add it to build/android/run_tests.py, else the | 23 # please also add it to build/android/run_tests.py, else the |
| 23 # test is not run. | 24 # test is not run. |
| 24 # | 25 # |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 'target_name': 'android_in_progress', | 58 'target_name': 'android_in_progress', |
| 58 'type': 'none', | 59 'type': 'none', |
| 59 'dependencies': [ | 60 'dependencies': [ |
| 60 '../content/content.gyp:content_browsertests', | 61 '../content/content.gyp:content_browsertests', |
| 61 '../chrome/chrome.gyp:unit_tests', | 62 '../chrome/chrome.gyp:unit_tests', |
| 62 '../ui/ui.gyp:gfx_unittests', | 63 '../ui/ui.gyp:gfx_unittests', |
| 63 ], | 64 ], |
| 64 }, | 65 }, |
| 65 ], # targets | 66 ], # targets |
| 66 } | 67 } |
| OLD | NEW |