| 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': { |
| 11 # A hook that can be overridden in other repositories to add additional | 11 # A hook that can be overridden in other repositories to add additional |
| 12 # compilation targets to 'All' | 12 # compilation targets to 'All' |
| 13 'android_app_targets%': [], | 13 'android_app_targets%': [], |
| 14 }, | 14 }, |
| 15 'targets': [ | 15 'targets': [ |
| 16 { | 16 { |
| 17 'target_name': 'All', | 17 'target_name': 'All', |
| 18 'type': 'none', | 18 'type': 'none', |
| 19 'dependencies': [ | 19 'dependencies': [ |
| 20 '../android_webview/android_webview.gyp:android_webview_apk', | 20 '../android_webview/android_webview.gyp:android_webview_apk', |
| 21 '../content/content.gyp:content_shell_apk', | 21 '../content/content.gyp:content_shell_apk', |
| 22 '<@(android_app_targets)', | 22 '<@(android_app_targets)', |
| 23 'android_builder_tests', | 23 'android_builder_tests', |
| 24 '../chrome/chrome.gyp:chromium_testshell' |
| 24 ], | 25 ], |
| 25 }, # target_name: All | 26 }, # target_name: All |
| 26 { | 27 { |
| 27 # The current list of tests for android. This is temporary | 28 # The current list of tests for android. This is temporary |
| 28 # until the full set supported. If adding a new test here, | 29 # until the full set supported. If adding a new test here, |
| 29 # please also add it to build/android/run_tests.py, else the | 30 # please also add it to build/android/run_tests.py, else the |
| 30 # test is not run. | 31 # test is not run. |
| 31 # | 32 # |
| 32 # WARNING: | 33 # WARNING: |
| 33 # Do not add targets here without communicating the implications | 34 # Do not add targets here without communicating the implications |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 # In-progress targets that are expected to fail and are NOT run | 104 # In-progress targets that are expected to fail and are NOT run |
| 104 # on any bot. | 105 # on any bot. |
| 105 'target_name': 'android_in_progress', | 106 'target_name': 'android_in_progress', |
| 106 'type': 'none', | 107 'type': 'none', |
| 107 'dependencies': [ | 108 'dependencies': [ |
| 108 '../content/content.gyp:content_browsertests', | 109 '../content/content.gyp:content_browsertests', |
| 109 ], | 110 ], |
| 110 }, | 111 }, |
| 111 ], # targets | 112 ], # targets |
| 112 } | 113 } |
| OLD | NEW |