Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: build/all_android.gyp

Issue 10447050: Add net, content and ipc to the default list of APK test bundles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add content and net apk bundles to all_android.gyp Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/gtest_filter/base_unittests_disabled » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 'conditions': [ 52 'conditions': [
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 '../ipc/ipc.gyp:ipc_tests_apk', 63 '../ipc/ipc.gyp:ipc_tests_apk',
64 '../net/net.gyp:net_unittests_apk',
63 '../ui/ui.gyp:ui_unittests_apk', 65 '../ui/ui.gyp:ui_unittests_apk',
64 ], 66 ],
65 }] 67 }]
66 ], 68 ],
67 }, 69 },
68 { 70 {
69 # Experimental / in-progress targets that are expected to fail 71 # Experimental / in-progress targets that are expected to fail
70 # but we still try to compile them on bots (turning the stage 72 # but we still try to compile them on bots (turning the stage
71 # orange, not red). 73 # orange, not red).
72 'target_name': 'android_experimental', 74 'target_name': 'android_experimental',
73 'type': 'none', 75 'type': 'none',
74 'dependencies': [ 76 'dependencies': [
75 '../chrome/chrome.gyp:unit_tests', 77 '../chrome/chrome.gyp:unit_tests',
76 ], 78 ],
77 }, 79 },
78 { 80 {
79 # In-progress targets that are expected to fail and are NOT run 81 # In-progress targets that are expected to fail and are NOT run
80 # on any bot. 82 # on any bot.
81 'target_name': 'android_in_progress', 83 'target_name': 'android_in_progress',
82 'type': 'none', 84 'type': 'none',
83 'dependencies': [ 85 'dependencies': [
84 '../content/content.gyp:content_browsertests', 86 '../content/content.gyp:content_browsertests',
85 ], 87 ],
86 }, 88 },
87 ], # targets 89 ], # targets
88 } 90 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gtest_filter/base_unittests_disabled » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698