| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 }], | 102 }], |
| 103 ], | 103 ], |
| 104 }, | 104 }, |
| 105 { | 105 { |
| 106 # Experimental / in-progress targets that are expected to fail | 106 # Experimental / in-progress targets that are expected to fail |
| 107 # but we still try to compile them on bots (turning the stage | 107 # but we still try to compile them on bots (turning the stage |
| 108 # orange, not red). | 108 # orange, not red). |
| 109 'target_name': 'android_experimental', | 109 'target_name': 'android_experimental', |
| 110 'type': 'none', | 110 'type': 'none', |
| 111 'dependencies': [ | 111 'dependencies': [ |
| 112 '../cc/cc_tests.gyp:cc_unittests', |
| 113 ], |
| 114 'conditions': [ |
| 115 ['"<(gtest_target_type)"=="shared_library"', { |
| 116 'dependencies': [ |
| 117 '../cc/cc_tests.gyp:cc_unittests_apk', |
| 118 ], |
| 119 }], |
| 112 ], | 120 ], |
| 113 }, | 121 }, |
| 114 { | 122 { |
| 115 # In-progress targets that are expected to fail and are NOT run | 123 # In-progress targets that are expected to fail and are NOT run |
| 116 # on any bot. | 124 # on any bot. |
| 117 'target_name': 'android_in_progress', | 125 'target_name': 'android_in_progress', |
| 118 'type': 'none', | 126 'type': 'none', |
| 119 'dependencies': [ | 127 'dependencies': [ |
| 120 '../content/content.gyp:content_browsertests', | 128 '../content/content.gyp:content_browsertests', |
| 121 ], | 129 ], |
| 122 }, | 130 }, |
| 123 ], # targets | 131 ], # targets |
| 124 } | 132 } |
| OLD | NEW |