| 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 18 matching lines...) Expand all Loading... |
| 29 # until the full set supported. If adding a new test here, | 29 # until the full set supported. If adding a new test here, |
| 30 # 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 |
| 31 # test is not run. | 31 # test is not run. |
| 32 # | 32 # |
| 33 # WARNING: | 33 # WARNING: |
| 34 # Do not add targets here without communicating the implications | 34 # Do not add targets here without communicating the implications |
| 35 # on tryserver triggers and load. Discuss with jrg please. | 35 # on tryserver triggers and load. Discuss with jrg please. |
| 36 'target_name': 'android_builder_tests', | 36 'target_name': 'android_builder_tests', |
| 37 'type': 'none', | 37 'type': 'none', |
| 38 'dependencies': [ | 38 'dependencies': [ |
| 39 '../android_webview/android_webview.gyp:android_webview_unittests', |
| 39 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', | 40 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', |
| 40 '../base/base.gyp:base_unittests', | 41 '../base/base.gyp:base_unittests', |
| 41 '../cc/cc_tests.gyp:cc_unittests', | 42 '../cc/cc_tests.gyp:cc_unittests', |
| 42 '../chrome/chrome.gyp:unit_tests', | 43 '../chrome/chrome.gyp:unit_tests', |
| 43 '../content/content.gyp:content_shell_test_apk', | 44 '../content/content.gyp:content_shell_test_apk', |
| 44 '../content/content.gyp:content_unittests', | 45 '../content/content.gyp:content_unittests', |
| 45 '../gpu/gpu.gyp:gpu_unittests', | 46 '../gpu/gpu.gyp:gpu_unittests', |
| 46 '../ipc/ipc.gyp:ipc_tests', | 47 '../ipc/ipc.gyp:ipc_tests', |
| 47 '../media/media.gyp:media_unittests', | 48 '../media/media.gyp:media_unittests', |
| 48 '../net/net.gyp:net_unittests', | 49 '../net/net.gyp:net_unittests', |
| (...skipping 19 matching lines...) Expand all Loading... |
| 68 ], | 69 ], |
| 69 }], | 70 }], |
| 70 ['"<(gtest_target_type)"=="shared_library"', { | 71 ['"<(gtest_target_type)"=="shared_library"', { |
| 71 'dependencies': [ | 72 'dependencies': [ |
| 72 # The first item is simply the template. We add as a dep | 73 # The first item is simply the template. We add as a dep |
| 73 # to make sure it builds in ungenerated form. TODO(jrg): | 74 # to make sure it builds in ungenerated form. TODO(jrg): |
| 74 # once stable, transition to a test-only (optional) | 75 # once stable, transition to a test-only (optional) |
| 75 # target. | 76 # target. |
| 76 '../testing/android/native_test.gyp:native_test_apk', | 77 '../testing/android/native_test.gyp:native_test_apk', |
| 77 # Unit test bundles packaged as an apk. | 78 # Unit test bundles packaged as an apk. |
| 79 '../android_webview/android_webview.gyp:android_webview_unittests_ap
k', |
| 78 '../base/base.gyp:base_unittests_apk', | 80 '../base/base.gyp:base_unittests_apk', |
| 79 '../cc/cc_tests.gyp:cc_unittests_apk', | 81 '../cc/cc_tests.gyp:cc_unittests_apk', |
| 80 '../chrome/chrome.gyp:unit_tests_apk', | 82 '../chrome/chrome.gyp:unit_tests_apk', |
| 81 '../content/content.gyp:content_unittests_apk', | 83 '../content/content.gyp:content_unittests_apk', |
| 82 '../gpu/gpu.gyp:gpu_unittests_apk', | 84 '../gpu/gpu.gyp:gpu_unittests_apk', |
| 83 '../ipc/ipc.gyp:ipc_tests_apk', | 85 '../ipc/ipc.gyp:ipc_tests_apk', |
| 84 '../media/media.gyp:media_unittests_apk', | 86 '../media/media.gyp:media_unittests_apk', |
| 85 '../net/net.gyp:net_unittests_apk', | 87 '../net/net.gyp:net_unittests_apk', |
| 86 '../sql/sql.gyp:sql_unittests_apk', | 88 '../sql/sql.gyp:sql_unittests_apk', |
| 87 '../sync/sync.gyp:sync_unit_tests_apk', | 89 '../sync/sync.gyp:sync_unit_tests_apk', |
| (...skipping 18 matching lines...) Expand all Loading... |
| 106 # In-progress targets that are expected to fail and are NOT run | 108 # In-progress targets that are expected to fail and are NOT run |
| 107 # on any bot. | 109 # on any bot. |
| 108 'target_name': 'android_in_progress', | 110 'target_name': 'android_in_progress', |
| 109 'type': 'none', | 111 'type': 'none', |
| 110 'dependencies': [ | 112 'dependencies': [ |
| 111 '../content/content.gyp:content_browsertests', | 113 '../content/content.gyp:content_browsertests', |
| 112 ], | 114 ], |
| 113 }, | 115 }, |
| 114 ], # targets | 116 ], # targets |
| 115 } | 117 } |
| OLD | NEW |