| 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': [ |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 ['"<(gtest_target_type)"=="shared_library"', { | 53 ['"<(gtest_target_type)"=="shared_library"', { |
| 54 'dependencies': [ | 54 'dependencies': [ |
| 55 # The first item is simply the template. We add as a dep | 55 # The first item is simply the template. We add as a dep |
| 56 # to make sure it builds in ungenerated form. TODO(jrg): | 56 # to make sure it builds in ungenerated form. TODO(jrg): |
| 57 # once stable, transition to a test-only (optional) | 57 # once stable, transition to a test-only (optional) |
| 58 # target. | 58 # target. |
| 59 '../testing/android/native_test.gyp:native_test_apk', | 59 '../testing/android/native_test.gyp:native_test_apk', |
| 60 # Unit test bundles packaged as an apk. | 60 # Unit test bundles packaged as an apk. |
| 61 '../base/base.gyp:base_unittests_apk', | 61 '../base/base.gyp:base_unittests_apk', |
| 62 '../content/content.gyp:content_unittests_apk', | 62 '../content/content.gyp:content_unittests_apk', |
| 63 '../gpu/gpu.gyp:gpu_unittests_apk', |
| 64 '../sql/sql.gyp:sql_unittests_apk', |
| 65 '../sync/sync.gyp:sync_unit_tests_apk', |
| 63 '../ipc/ipc.gyp:ipc_tests_apk', | 66 '../ipc/ipc.gyp:ipc_tests_apk', |
| 64 '../net/net.gyp:net_unittests_apk', | 67 '../net/net.gyp:net_unittests_apk', |
| 65 '../ui/ui.gyp:ui_unittests_apk', | 68 '../ui/ui.gyp:ui_unittests_apk', |
| 66 ], | 69 ], |
| 67 }] | 70 }] |
| 68 ], | 71 ], |
| 69 }, | 72 }, |
| 70 { | 73 { |
| 71 # Experimental / in-progress targets that are expected to fail | 74 # Experimental / in-progress targets that are expected to fail |
| 72 # but we still try to compile them on bots (turning the stage | 75 # but we still try to compile them on bots (turning the stage |
| 73 # orange, not red). | 76 # orange, not red). |
| 74 'target_name': 'android_experimental', | 77 'target_name': 'android_experimental', |
| 75 'type': 'none', | 78 'type': 'none', |
| 76 'dependencies': [ | 79 'dependencies': [ |
| 77 '../chrome/chrome.gyp:unit_tests', | 80 '../chrome/chrome.gyp:unit_tests', |
| 78 ], | 81 ], |
| 79 }, | 82 }, |
| 80 { | 83 { |
| 81 # In-progress targets that are expected to fail and are NOT run | 84 # In-progress targets that are expected to fail and are NOT run |
| 82 # on any bot. | 85 # on any bot. |
| 83 'target_name': 'android_in_progress', | 86 'target_name': 'android_in_progress', |
| 84 'type': 'none', | 87 'type': 'none', |
| 85 'dependencies': [ | 88 'dependencies': [ |
| 86 '../content/content.gyp:content_browsertests', | 89 '../content/content.gyp:content_browsertests', |
| 87 ], | 90 ], |
| 88 }, | 91 }, |
| 89 ], # targets | 92 ], # targets |
| 90 } | 93 } |
| OLD | NEW |