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

Side by Side Diff: chrome/chrome_shell.gypi

Issue 1259883007: Remove the Finch test 'CLD1VsCLD2' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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 | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 GYPI allows independent customization of the chrome shell in a manner 5 # This GYPI allows independent customization of the chrome shell in a manner
6 # similar to content shell (in content_shell.gypi). Notably, this file does 6 # similar to content shell (in content_shell.gypi). Notably, this file does
7 # NOT contain chrome_android_core, which is independent of the chrome shell 7 # NOT contain chrome_android_core, which is independent of the chrome shell
8 # and should be separately customized. 8 # and should be separately customized.
9 { 9 {
10 'variables': { 10 'variables': {
(...skipping 18 matching lines...) Expand all
29 ], 29 ],
30 }, 30 },
31 'conditions': [ 31 'conditions': [
32 [ 'order_profiling!=0', { 32 [ 'order_profiling!=0', {
33 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 33 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
34 }], 34 }],
35 [ 'use_allocator!="none"', { 35 [ 'use_allocator!="none"', {
36 'dependencies': [ 36 'dependencies': [
37 '../base/allocator/allocator.gyp:allocator', ], 37 '../base/allocator/allocator.gyp:allocator', ],
38 }], 38 }],
39 [ 'cld_version==0 or cld_version==2', { 39 [ 'cld_version==2', {
40 'dependencies': [ 40 'dependencies': [
41 # Chrome shell should always use the statically-linked CLD data. 41 # Chrome shell should always use the statically-linked CLD data.
42 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ], 42 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
43 }], 43 }],
44 ], 44 ],
45 }, 45 },
46 { 46 {
47 # GN: //chrome/android:chrome_shell 47 # GN: //chrome/android:chrome_shell
48 'target_name': 'libchromeshell', 48 'target_name': 'libchromeshell',
49 'type': 'shared_library', 49 'type': 'shared_library',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'target_name': 'chrome_sync_shell_apk_java', 168 'target_name': 'chrome_sync_shell_apk_java',
169 'type': 'none', 169 'type': 'none',
170 'dependencies': [ 170 'dependencies': [
171 'chrome_sync_shell_apk', 171 'chrome_sync_shell_apk',
172 ], 172 ],
173 'includes': [ '../build/apk_fake_jar.gypi' ], 173 'includes': [ '../build/apk_fake_jar.gypi' ],
174 }, 174 },
175 ], 175 ],
176 176
177 } 177 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698