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

Side by Side Diff: build/all_android.gyp

Issue 9421014: Remove temporary workaround for http://codereview.chromium.org/9419020/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 10 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
« no previous file with comments | « no previous file | no next file » | 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 16 matching lines...) Expand all
27 # on tryserver triggers and load. Discuss with jrg please. 27 # on tryserver triggers and load. Discuss with jrg please.
28 'target_name': 'android_builder_tests', 28 'target_name': 'android_builder_tests',
29 'type': 'none', 29 'type': 'none',
30 'dependencies': [ 30 'dependencies': [
31 '../base/base.gyp:base_unittests', 31 '../base/base.gyp:base_unittests',
32 '../sql/sql.gyp:sql_unittests', 32 '../sql/sql.gyp:sql_unittests',
33 '../ipc/ipc.gyp:ipc_tests', 33 '../ipc/ipc.gyp:ipc_tests',
34 '../net/net.gyp:net_unittests', 34 '../net/net.gyp:net_unittests',
35 # From here down: not added to run_tests.py yet. 35 # From here down: not added to run_tests.py yet.
36 '../jingle/jingle.gyp:jingle_unittests', 36 '../jingle/jingle.gyp:jingle_unittests',
37 # Workaround of crbug.com/109763. 37 '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
38 # TODO(wangxianzhu): Enable them in the next CL. 38 '../tools/android/forwarder/forwarder.gyp:forwarder',
39 # '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
40 # '../tools/android/forwarder/forwarder.gyp:forwarder',
41 ], 39 ],
42 }, 40 },
43 { 41 {
44 # Experimental / in-progress targets that are expected to fail 42 # Experimental / in-progress targets that are expected to fail
45 # but we still try to compile them on bots (turning the stage 43 # but we still try to compile them on bots (turning the stage
46 # orange, not red). 44 # orange, not red).
47 'target_name': 'android_experimental', 45 'target_name': 'android_experimental',
48 'type': 'none', 46 'type': 'none',
49 'dependencies': [ 47 'dependencies': [
50 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', 48 '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
51 '../webkit/webkit.gyp:pull_in_DumpRenderTree', 49 '../webkit/webkit.gyp:pull_in_DumpRenderTree',
52 '../chrome/chrome.gyp:unit_tests', 50 '../chrome/chrome.gyp:unit_tests',
53 ], 51 ],
54 }, 52 },
55 { 53 {
56 # In-progress targets that are expected to fail and are NOT run 54 # In-progress targets that are expected to fail and are NOT run
57 # on any bot. 55 # on any bot.
58 'target_name': 'android_in_progress', 56 'target_name': 'android_in_progress',
59 'type': 'none', 57 'type': 'none',
60 'dependencies': [ 58 'dependencies': [
61 '../content/content.gyp:content_browsertests', 59 '../content/content.gyp:content_browsertests',
62 '../content/content.gyp:content_unittests', 60 '../content/content.gyp:content_unittests',
63 '../chrome/chrome.gyp:sync_unit_tests', 61 '../chrome/chrome.gyp:sync_unit_tests',
64 '../ui/ui.gyp:gfx_unittests', 62 '../ui/ui.gyp:gfx_unittests',
65 ], 63 ],
66 }, 64 },
67 ], # targets 65 ], # targets
68 } 66 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698