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

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

Issue 10251004: Move libxml_utils from chrome/common to third_party/libxml/chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move to third_party/libxml/chromium. Created 8 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 | Annotate | Revision Log
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"', { 10 ['os_posix == 1 and OS != "mac"', {
(...skipping 22 matching lines...) Expand all
33 'ldflags': [ 33 'ldflags': [
34 '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)', 34 '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
35 ], 35 ],
36 'libraries': [ 36 'libraries': [
37 '<!@(pkg-config --libs-only-l libxml-2.0)', 37 '<!@(pkg-config --libs-only-l libxml-2.0)',
38 ], 38 ],
39 }, 39 },
40 }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml 40 }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
41 'type': 'static_library', 41 'type': 'static_library',
42 'sources': [ 42 'sources': [
43 'chromium/include/libxml/libxml_utils.h',
Paweł Hajdan Jr. 2012/05/04 07:37:25 This breaks when -Duse_system_libxml=1 is used. Ca
dtu 2012/05/07 22:59:11 Fixed the use_system_libxml condition.
44 'chromium/libxml_utils.cc',
43 'linux/config.h', 45 'linux/config.h',
44 'linux/include/libxml/xmlversion.h', 46 'linux/include/libxml/xmlversion.h',
45 'mac/config.h', 47 'mac/config.h',
46 'mac/include/libxml/xmlversion.h', 48 'mac/include/libxml/xmlversion.h',
47 'src/include/libxml/c14n.h', 49 'src/include/libxml/c14n.h',
48 'src/include/libxml/catalog.h', 50 'src/include/libxml/catalog.h',
49 'src/include/libxml/chvalid.h', 51 'src/include/libxml/chvalid.h',
50 'src/include/libxml/debugXML.h', 52 'src/include/libxml/debugXML.h',
51 'src/include/libxml/dict.h', 53 'src/include/libxml/dict.h',
52 'src/include/libxml/DOCBparser.h', 54 'src/include/libxml/DOCBparser.h',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'defines': [ 154 'defines': [
153 # Define LIBXML_STATIC as nothing to match how libxml.h 155 # Define LIBXML_STATIC as nothing to match how libxml.h
154 # (an internal header) defines LIBXML_STATIC, otherwise 156 # (an internal header) defines LIBXML_STATIC, otherwise
155 # we get the macro redefined warning from GCC. (-DFOO 157 # we get the macro redefined warning from GCC. (-DFOO
156 # defines the macro FOO as 1.) 158 # defines the macro FOO as 1.)
157 'LIBXML_STATIC=', 159 'LIBXML_STATIC=',
158 ], 160 ],
159 'include_dirs': [ 161 'include_dirs': [
160 '<(os_include)', 162 '<(os_include)',
161 '<(os_include)/include', 163 '<(os_include)/include',
164 'chromium/include',
162 'src/include', 165 'src/include',
163 ], 166 ],
164 'dependencies': [ 167 'dependencies': [
165 '../icu/icu.gyp:icuuc', 168 '../icu/icu.gyp:icuuc',
166 '../zlib/zlib.gyp:zlib', 169 '../zlib/zlib.gyp:zlib',
167 ], 170 ],
168 'export_dependent_settings': [ 171 'export_dependent_settings': [
169 '../icu/icu.gyp:icuuc', 172 '../icu/icu.gyp:icuuc',
170 ], 173 ],
171 'direct_dependent_settings': { 174 'direct_dependent_settings': {
172 'defines': [ 175 'defines': [
173 'LIBXML_STATIC', 176 'LIBXML_STATIC',
174 ], 177 ],
175 'include_dirs': [ 178 'include_dirs': [
176 '<(os_include)/include', 179 '<(os_include)/include',
180 'chromium/include',
177 'src/include', 181 'src/include',
178 ], 182 ],
179 }, 183 },
180 'conditions': [ 184 'conditions': [
181 ['OS=="linux"', { 185 ['OS=="linux"', {
182 'link_settings': { 186 'link_settings': {
183 'libraries': [ 187 'libraries': [
184 # We need dl for dlopen() and friends. 188 # We need dl for dlopen() and friends.
185 '-ldl', 189 '-ldl',
186 ], 190 ],
(...skipping 21 matching lines...) Expand all
208 '-Wno-pointer-sign', 212 '-Wno-pointer-sign',
209 '-Wno-empty-body', 213 '-Wno-empty-body',
210 ], 214 ],
211 }], 215 }],
212 ], 216 ],
213 }], 217 }],
214 ], 218 ],
215 }, 219 },
216 ], 220 ],
217 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698