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

Side by Side Diff: build/all_android.gyp

Issue 10867008: Get rid of device/host clock synchronization in android_commands.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Marcus' comments Created 8 years, 3 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/pylib/android_commands.py » ('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 11 matching lines...) Expand all
22 # please also add it to build/android/run_tests.py, else the 22 # please also add it to build/android/run_tests.py, else the
23 # test is not run. 23 # test is not run.
24 # 24 #
25 # WARNING: 25 # WARNING:
26 # Do not add targets here without communicating the implications 26 # Do not add targets here without communicating the implications
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 '../chrome/chrome.gyp:unit_tests',
32 '../content/content.gyp:content_shell_test_apk', 33 '../content/content.gyp:content_shell_test_apk',
33 '../content/content.gyp:content_unittests', 34 '../content/content.gyp:content_unittests',
34 '../chrome/chrome.gyp:unit_tests',
35 '../gpu/gpu.gyp:gpu_unittests', 35 '../gpu/gpu.gyp:gpu_unittests',
36 '../ipc/ipc.gyp:ipc_tests',
37 '../net/net.gyp:net_unittests',
36 '../sql/sql.gyp:sql_unittests', 38 '../sql/sql.gyp:sql_unittests',
37 '../sync/sync.gyp:sync_unit_tests', 39 '../sync/sync.gyp:sync_unit_tests',
38 '../ipc/ipc.gyp:ipc_tests',
39 '../net/net.gyp:net_unittests',
40 '../ui/ui.gyp:ui_unittests',
41 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', 40 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
42 # From here down: not added to run_tests.py yet.
43 '../jingle/jingle.gyp:jingle_unittests',
44 '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s tats_monitor', 41 '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s tats_monitor',
45 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', 42 '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
46 '../tools/android/forwarder/forwarder.gyp:forwarder', 43 '../tools/android/forwarder/forwarder.gyp:forwarder',
44 '../tools/android/md5sum/md5sum.gyp:md5sum',
45 '../ui/ui.gyp:ui_unittests',
46 # From here down: not added to run_tests.py yet.
47 '../jingle/jingle.gyp:jingle_unittests',
47 '../media/media.gyp:media_unittests', 48 '../media/media.gyp:media_unittests',
48 # Required by ui_unittests. 49 # Required by ui_unittests.
49 # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but 50 # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
50 # this would cause circular gyp dependency which needs refactoring the 51 # this would cause circular gyp dependency which needs refactoring the
51 # gyps to resolve. 52 # gyps to resolve.
52 '../chrome/chrome_resources.gyp:packed_resources', 53 '../chrome/chrome_resources.gyp:packed_resources',
53 ], 54 ],
54 'conditions': [ 55 'conditions': [
55 ['"<(gtest_target_type)"=="shared_library"', { 56 ['"<(gtest_target_type)"=="shared_library"', {
56 'dependencies': [ 57 'dependencies': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 # In-progress targets that are expected to fail and are NOT run 91 # In-progress targets that are expected to fail and are NOT run
91 # on any bot. 92 # on any bot.
92 'target_name': 'android_in_progress', 93 'target_name': 'android_in_progress',
93 'type': 'none', 94 'type': 'none',
94 'dependencies': [ 95 'dependencies': [
95 '../content/content.gyp:content_browsertests', 96 '../content/content.gyp:content_browsertests',
96 ], 97 ],
97 }, 98 },
98 ], # targets 99 ], # targets
99 } 100 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/android_commands.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698