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

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

Issue 548513002: android_webview: stop using system libjpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « third_party/BUILD.gn ('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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 'direct_dependent_settings': { 88 'direct_dependent_settings': {
89 'defines': [ 89 'defines': [
90 'USE_SYSTEM_LIBJPEG', 90 'USE_SYSTEM_LIBJPEG',
91 ], 91 ],
92 'conditions': [ 92 'conditions': [
93 ['os_bsd==1', { 93 ['os_bsd==1', {
94 'include_dirs': [ 94 'include_dirs': [
95 '/usr/local/include', 95 '/usr/local/include',
96 ], 96 ],
97 }], 97 }],
98 ['OS=="android"', {
99 'include_dirs': [
100 '<(android_src)/external/jpeg',
101 ],
102 }],
103 ], 98 ],
104 }, 99 },
105 'link_settings': { 100 'link_settings': {
106 'libraries': [ 101 'libraries': [
107 '-ljpeg', 102 '-ljpeg',
108 ], 103 ],
109 }, 104 },
110 } 105 }
111 ], 106 ],
112 }], 107 }],
113 ], 108 ],
114 } 109 }
OLDNEW
« no previous file with comments | « third_party/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698