| 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 22 matching lines...) Expand all Loading... |
| 33 'target_name': 'all_webkit', | 33 'target_name': 'all_webkit', |
| 34 'type': 'none', | 34 'type': 'none', |
| 35 'dependencies': [ | 35 'dependencies': [ |
| 36 '../third_party/WebKit/public/all.gyp:all_blink', | 36 '../third_party/WebKit/public/all.gyp:all_blink', |
| 37 '../content/content.gyp:content_shell_apk', | 37 '../content/content.gyp:content_shell_apk', |
| 38 ], | 38 ], |
| 39 }, # target_name: all_webkit | 39 }, # target_name: all_webkit |
| 40 { | 40 { |
| 41 # The current list of tests for android. This is temporary | 41 # The current list of tests for android. This is temporary |
| 42 # until the full set supported. If adding a new test here, | 42 # until the full set supported. If adding a new test here, |
| 43 # please also add it to build/android/run_tests.py, else the | 43 # please also add it to build/android/pylib/gtest/gtest_config.py, |
| 44 # test is not run. | 44 # else the test is not run. |
| 45 # | 45 # |
| 46 # WARNING: | 46 # WARNING: |
| 47 # Do not add targets here without communicating the implications | 47 # Do not add targets here without communicating the implications |
| 48 # on tryserver triggers and load. Discuss with jrg please. | 48 # on tryserver triggers and load. Discuss with jrg please. |
| 49 'target_name': 'android_builder_tests', | 49 'target_name': 'android_builder_tests', |
| 50 'type': 'none', | 50 'type': 'none', |
| 51 'dependencies': [ | 51 'dependencies': [ |
| 52 '../android_webview/android_webview.gyp:android_webview_unittests', | 52 '../android_webview/android_webview.gyp:android_webview_unittests', |
| 53 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', | 53 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', |
| 54 '../base/base.gyp:base_unittests', | 54 '../base/base.gyp:base_unittests', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 { | 127 { |
| 128 # In-progress targets that are expected to fail and are NOT run | 128 # In-progress targets that are expected to fail and are NOT run |
| 129 # on any bot. | 129 # on any bot. |
| 130 'target_name': 'android_in_progress', | 130 'target_name': 'android_in_progress', |
| 131 'type': 'none', | 131 'type': 'none', |
| 132 'dependencies': [ | 132 'dependencies': [ |
| 133 ], | 133 ], |
| 134 }, | 134 }, |
| 135 ], # targets | 135 ], # targets |
| 136 } | 136 } |
| OLD | NEW |