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

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

Issue 8486008: Default to building instead of just linking libpng for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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" and OS != "android"', {
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_libpng%': 1, 10 'use_system_libpng%': 1,
11 }, { # os_posix != 1 or OS == "mac" 11 }, { # os_posix != 1 or OS == "mac"
12 'use_system_libpng%': 0, 12 'use_system_libpng%': 0,
13 }], 13 }],
14 ], 14 ],
15 }, 15 },
16 'conditions': [ 16 'conditions': [
17 ['use_system_libpng==0', { 17 ['use_system_libpng==0', {
18 'targets': [ 18 'targets': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 ], 112 ],
113 'libraries': [ 113 'libraries': [
114 '<!@(<(pkg-config) --libs-only-l libpng)', 114 '<!@(<(pkg-config) --libs-only-l libpng)',
115 ], 115 ],
116 }, 116 },
117 }, 117 },
118 ], 118 ],
119 }], 119 }],
120 ], 120 ],
121 } 121 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698