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

Side by Side Diff: third_party/bzip2/bzip2.gyp

Issue 7889051: Remove 'settings' type from gyp files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « sandbox/sandbox.gyp ('k') | third_party/expat/expat.gyp » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 [ 'os_posix == 1 and OS != "mac"', { 8 [ 'os_posix == 1 and OS != "mac"', {
9 # Link to system .so since we already use it due to GTK. 9 # Link to system .so since we already use it due to GTK.
10 'use_system_bzip2%': 1, 10 'use_system_bzip2%': 1,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 }, { # else: OS!="win" 42 }, { # else: OS!="win"
43 'product_name': 'chrome_bz2', 43 'product_name': 'chrome_bz2',
44 }], 44 }],
45 ], 45 ],
46 }, 46 },
47 ], 47 ],
48 }, { 48 }, {
49 'targets': [ 49 'targets': [
50 { 50 {
51 'target_name': 'bzip2', 51 'target_name': 'bzip2',
52 'type': 'settings', 52 'type': 'none',
53 53
54 'direct_dependent_settings': { 54 'direct_dependent_settings': {
55 'defines': [ 55 'defines': [
56 'USE_SYSTEM_LIBBZ2', 56 'USE_SYSTEM_LIBBZ2',
57 ], 57 ],
58 }, 58 },
59 59
60 # There aren't any pkg-config files for libbz2 60 # There aren't any pkg-config files for libbz2
61 'link_settings': { 61 'link_settings': {
62 'libraries': [ 62 'libraries': [
63 '-lbz2', 63 '-lbz2',
64 ], 64 ],
65 }, 65 },
66 }, 66 },
67 ] 67 ]
68 }], 68 }],
69 ], 69 ],
70 } 70 }
OLDNEW
« no previous file with comments | « sandbox/sandbox.gyp ('k') | third_party/expat/expat.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698