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

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

Issue 1154213004: Revert of Fix use of 'sysroot' variable in harfbuzz.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/harfbuzz-ng/harfbuzz.gyp ('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) 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 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['OS == "linux" and chromeos==0', { 8 ['OS == "linux" and chromeos==0', {
9 'use_system_libexif%': 1, 9 'use_system_libexif%': 1,
10 }, { # OS != "linux" and chromeos==0 10 }, { # OS != "linux" and chromeos==0
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 'msvs_settings': { 107 'msvs_settings': {
108 'VCCLCompilerTool': { 108 'VCCLCompilerTool': {
109 'AdditionalOptions!': [ '/analyze' ] 109 'AdditionalOptions!': [ '/analyze' ]
110 }, 110 },
111 }, 111 },
112 }], 112 }],
113 ], 113 ],
114 }, 114 },
115 ], 115 ],
116 }, { # 'use_system_libexif!=0 116 }, { # 'use_system_libexif!=0
117 'conditions': [
118 ['sysroot!=""', {
119 'variables': {
120 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<( target_arch)" "<(system_libdir)"',
121 },
122 }, {
123 'variables': {
124 'pkg-config': 'pkg-config'
125 },
126 }],
127 ],
117 'targets': [ 128 'targets': [
118 { 129 {
119 'target_name': 'libexif', 130 'target_name': 'libexif',
120 'type': 'none', 131 'type': 'none',
121 'direct_dependent_settings': { 132 'direct_dependent_settings': {
122 'cflags': [ 133 'cflags': [
123 '<!@(<(pkg-config) --cflags libexif)', 134 '<!@(<(pkg-config) --cflags libexif)',
124 ], 135 ],
125 'defines': [ 136 'defines': [
126 'USE_SYSTEM_LIBEXIF', 137 'USE_SYSTEM_LIBEXIF',
127 ], 138 ],
128 }, 139 },
129 } 140 }
130 ], 141 ],
131 }], 142 }],
132 ] 143 ]
133 } 144 }
OLDNEW
« no previous file with comments | « third_party/harfbuzz-ng/harfbuzz.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698