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

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

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/libevent/evdns.c ('k') | third_party/mesa/mesa.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) 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 # Define an "os_include" variable that points at the OS-specific generated 8 # Define an "os_include" variable that points at the OS-specific generated
9 # headers. These were generated by running the configure script offline. 9 # headers. These were generated by running the configure script offline.
10 ['os_posix == 1 and OS != "mac" and OS != "ios"', { 10 ['os_posix == 1 and OS != "mac" and OS != "ios"', {
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 '<(os_include)/include', 230 '<(os_include)/include',
231 'src/include', 231 'src/include',
232 ], 232 ],
233 }, 233 },
234 'conditions': [ 234 'conditions': [
235 ['OS=="linux"', { 235 ['OS=="linux"', {
236 'link_settings': { 236 'link_settings': {
237 'libraries': [ 237 'libraries': [
238 # We need dl for dlopen() and friends. 238 # We need dl for dlopen() and friends.
239 '-ldl', 239 '-ldl',
240 '-lm',
240 ], 241 ],
241 }, 242 },
242 }], 243 }],
243 # http://www.xmlsoft.org/threads.html says that this is required 244 # http://www.xmlsoft.org/threads.html says that this is required
244 # when using libxml from several threads, which can possibly happen 245 # when using libxml from several threads, which can possibly happen
245 # in chrome. On linux, this is picked up by transitivity from 246 # in chrome. On linux, this is picked up by transitivity from
246 # pkg-config output from build/linux/system.gyp. 247 # pkg-config output from build/linux/system.gyp.
247 ['OS=="mac" or OS=="android"', {'defines': ['_REENTRANT']}], 248 ['OS=="mac" or OS=="android"', {'defines': ['_REENTRANT']}],
248 ['OS=="win"', { 249 ['OS=="win"', {
249 'product_name': 'libxml2', 250 'product_name': 'libxml2',
250 # Disable unimportant 'unused variable' warning, and 251 # Disable unimportant 'unused variable' warning, and
251 # signed/unsigned comparison warning. The signed/unsigned (4101) 252 # signed/unsigned comparison warning. The signed/unsigned (4101)
252 # is fixed upstream and can be removed eventually. 253 # is fixed upstream and can be removed eventually.
253 # TODO(jschuh): http://crbug.com/167187 size_t -> int 254 # TODO(jschuh): http://crbug.com/167187 size_t -> int
254 'msvs_disabled_warnings': [ 4018, 4101, 4267 ], 255 'msvs_disabled_warnings': [ 4018, 4101, 4267 ],
255 }, { # else: OS!="win" 256 }, { # else: OS!="win"
256 'product_name': 'xml2', 257 'product_name': 'xml2',
257 }], 258 }],
258 ], 259 ],
259 }], 260 }],
260 ['OS == "ios"', { 261 ['OS == "ios"', {
261 'toolsets': ['host', 'target'], 262 'toolsets': ['host', 'target'],
262 }], 263 }],
263 ], 264 ],
264 }, 265 },
265 ], 266 ],
266 } 267 }
OLDNEW
« no previous file with comments | « third_party/libevent/evdns.c ('k') | third_party/mesa/mesa.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698