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

Side by Side Diff: build/all_android.gyp

Issue 9852004: Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | « base/test/android/native_test_launcher.cc ('k') | build/android/envsetup.sh » ('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 17 matching lines...) Expand all
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 '../chrome/chrome.gyp:sync_unit_tests', 32 '../chrome/chrome.gyp:sync_unit_tests',
33 '../content/content.gyp:content_unittests', 33 '../content/content.gyp:content_unittests',
34 '../sql/sql.gyp:sql_unittests', 34 '../sql/sql.gyp:sql_unittests',
35 '../ipc/ipc.gyp:ipc_tests', 35 '../ipc/ipc.gyp:ipc_tests',
36 '../net/net.gyp:net_unittests', 36 '../net/net.gyp:net_unittests',
37 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', 37 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
38 # From here down: not added to run_tests.py yet.
39 '../jingle/jingle.gyp:jingle_unittests',
38 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', 40 '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
39 '../tools/android/forwarder/forwarder.gyp:forwarder', 41 '../tools/android/forwarder/forwarder.gyp:forwarder',
40 # From here down: not added to run_tests.py yet.
41 '../jingle/jingle.gyp:jingle_unittests',
42 '../media/media.gyp:media_unittests', 42 '../media/media.gyp:media_unittests',
43 ], 43 ],
44 # The Native Test Runner is not on by default.
45 'conditions': [
46 ['gtest_target_type=="shared_library"', {
47 'dependencies': [
48 '../base/base.gyp:native_test_apk',
49 ]
50 }]],
51 }, 44 },
52 { 45 {
53 # Experimental / in-progress targets that are expected to fail 46 # Experimental / in-progress targets that are expected to fail
54 # but we still try to compile them on bots (turning the stage 47 # but we still try to compile them on bots (turning the stage
55 # orange, not red). 48 # orange, not red).
56 'target_name': 'android_experimental', 49 'target_name': 'android_experimental',
57 'type': 'none', 50 'type': 'none',
58 'dependencies': [ 51 'dependencies': [
59 ], 52 ],
60 }, 53 },
61 { 54 {
62 # In-progress targets that are expected to fail and are NOT run 55 # In-progress targets that are expected to fail and are NOT run
63 # on any bot. 56 # on any bot.
64 'target_name': 'android_in_progress', 57 'target_name': 'android_in_progress',
65 'type': 'none', 58 'type': 'none',
66 'dependencies': [ 59 'dependencies': [
67 '../content/content.gyp:content_browsertests', 60 '../content/content.gyp:content_browsertests',
68 '../chrome/chrome.gyp:unit_tests', 61 '../chrome/chrome.gyp:unit_tests',
69 '../ui/ui.gyp:gfx_unittests', 62 '../ui/ui.gyp:gfx_unittests',
70 ], 63 ],
71 }, 64 },
72 ], # targets 65 ], # targets
73 } 66 }
OLDNEW
« no previous file with comments | « base/test/android/native_test_launcher.cc ('k') | build/android/envsetup.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698