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

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

Issue 10807019: Hook up use_system_libjpeg for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comment Created 8 years, 5 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 | « build/common.gypi ('k') | 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) 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 # This file handles building both with our local libjpeg and with the system 6 # This file handles building both with our local libjpeg and with the system
7 # libjpeg. 7 # libjpeg.
8 'conditions': [ 8 'conditions': [
9 ['use_system_libjpeg==0', { 9 ['use_system_libjpeg==0', {
10 'targets': [ 10 'targets': [
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 'direct_dependent_settings': { 85 'direct_dependent_settings': {
86 'defines': [ 86 'defines': [
87 'USE_SYSTEM_LIBJPEG', 87 'USE_SYSTEM_LIBJPEG',
88 ], 88 ],
89 'conditions': [ 89 'conditions': [
90 ['os_bsd==1', { 90 ['os_bsd==1', {
91 'include_dirs': [ 91 'include_dirs': [
92 '/usr/local/include', 92 '/usr/local/include',
93 ], 93 ],
94 }], 94 }],
95 ['OS=="android"', {
96 'include_dirs': [
97 '<(android_src)/external/jpeg',
98 ],
99 }],
95 ], 100 ],
96 }, 101 },
97 'link_settings': { 102 'link_settings': {
98 'libraries': [ 103 'libraries': [
99 '-ljpeg', 104 '-ljpeg',
100 ], 105 ],
101 }, 106 },
102 } 107 }
103 ], 108 ],
104 }], 109 }],
105 ], 110 ],
106 } 111 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698