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

Side by Side Diff: chrome/chrome_dll.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/browser/chrome_browser_field_trials.cc ('k') | chrome/chrome_shell.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 (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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 ['chrome_multiple_dll==0 and enable_plugins==1', { 266 ['chrome_multiple_dll==0 and enable_plugins==1', {
267 'dependencies': [ 267 'dependencies': [
268 '../pdf/pdf.gyp:pdf', 268 '../pdf/pdf.gyp:pdf',
269 ], 269 ],
270 }], 270 }],
271 ['cld_version==1', { 271 ['cld_version==1', {
272 'dependencies': [ 272 'dependencies': [
273 '<(DEPTH)/third_party/cld/cld.gyp:cld', 273 '<(DEPTH)/third_party/cld/cld.gyp:cld',
274 ], 274 ],
275 }], 275 }],
276 ['cld_version==0 or cld_version==2', { 276 ['cld_version==2', {
277 'dependencies': [ 277 'dependencies': [
278 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', 278 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
279 ], 279 ],
280 }], 280 }],
281 ['OS=="mac" and component!="shared_library"', { 281 ['OS=="mac" and component!="shared_library"', {
282 'includes': [ 'chrome_dll_bundle.gypi' ], 282 'includes': [ 'chrome_dll_bundle.gypi' ],
283 }], 283 }],
284 ['OS=="mac" and component=="shared_library"', { 284 ['OS=="mac" and component=="shared_library"', {
285 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], }, 285 'xcode_settings': { 'OTHER_LDFLAGS': [ '-Wl,-ObjC' ], },
286 }], 286 }],
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 'dependencies': [ 379 'dependencies': [
380 '../pdf/pdf.gyp:pdf', 380 '../pdf/pdf.gyp:pdf',
381 ], 381 ],
382 }], 382 }],
383 ], 383 ],
384 }, # target chrome_child_dll 384 }, # target chrome_child_dll
385 ], 385 ],
386 }], 386 }],
387 ], 387 ],
388 } 388 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_field_trials.cc ('k') | chrome/chrome_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698