| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests_apk' | 116 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests_apk' |
| 117 ], | 117 ], |
| 118 }], | 118 }], |
| 119 ], | 119 ], |
| 120 }, | 120 }, |
| 121 { | 121 { |
| 122 # WebRTC Android APK tests. | 122 # WebRTC Android APK tests. |
| 123 'target_name': 'android_builder_webrtc', | 123 'target_name': 'android_builder_webrtc', |
| 124 'type': 'none', | 124 'type': 'none', |
| 125 'variables': { | 125 'variables': { |
| 126 # WebRTC tests are normally not built by Chromium bots. | 126 # Set default value for include_tests to '0'. It is normally only |
| 127 # used in WebRTC GYP files. It is set to '1' only when building |
| 128 # WebRTC for Android, inside a Chromium checkout. |
| 127 'include_tests%': 0, | 129 'include_tests%': 0, |
| 128 }, | 130 }, |
| 129 'conditions': [ | 131 'conditions': [ |
| 130 ['"<(gtest_target_type)"=="shared_library" and include_tests==1', { | 132 ['"<(gtest_target_type)"=="shared_library" and include_tests==1', { |
| 131 'dependencies': [ | 133 'dependencies': [ |
| 132 '../third_party/webrtc/build/apk_tests.gyp:*', | 134 '../third_party/webrtc/build/apk_tests.gyp:*', |
| 133 ], | 135 ], |
| 134 }], | 136 }], |
| 135 ], | 137 ], |
| 136 }, # target_name: android_builder_webrtc | 138 }, # target_name: android_builder_webrtc |
| 137 { | 139 { |
| 140 # WebRTC Chromium tests to run on Android. |
| 141 'target_name': 'android_builder_chromium_webrtc', |
| 142 'type': 'none', |
| 143 'dependencies': [ |
| 144 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 145 '../tools/android/android_tools.gyp:android_tools', |
| 146 '../tools/android/android_tools.gyp:memconsumer', |
| 147 ], |
| 148 'conditions': [ |
| 149 ['"<(gtest_target_type)"=="shared_library"', { |
| 150 'dependencies': [ |
| 151 # Unit test bundles packaged as an apk. |
| 152 '../content/content_shell_and_tests.gyp:content_browsertests_apk', |
| 153 ], |
| 154 }], |
| 155 ], |
| 156 }, # target_name: android_builder_chromium_webrtc |
| 157 { |
| 138 # Experimental / in-progress targets that are expected to fail | 158 # Experimental / in-progress targets that are expected to fail |
| 139 # but we still try to compile them on bots (turning the stage | 159 # but we still try to compile them on bots (turning the stage |
| 140 # orange, not red). | 160 # orange, not red). |
| 141 'target_name': 'android_experimental', | 161 'target_name': 'android_experimental', |
| 142 'type': 'none', | 162 'type': 'none', |
| 143 'dependencies': [ | 163 'dependencies': [ |
| 144 ], | 164 ], |
| 145 }, | 165 }, |
| 146 { | 166 { |
| 147 # In-progress targets that are expected to fail and are NOT run | 167 # In-progress targets that are expected to fail and are NOT run |
| 148 # on any bot. | 168 # on any bot. |
| 149 'target_name': 'android_in_progress', | 169 'target_name': 'android_in_progress', |
| 150 'type': 'none', | 170 'type': 'none', |
| 151 'dependencies': [ | 171 'dependencies': [ |
| 152 ], | 172 ], |
| 153 }, | 173 }, |
| 154 ], # targets | 174 ], # targets |
| 155 } | 175 } |
| OLD | NEW |