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

Unified 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: Nit and fix use_system_libxml condition. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libxml/chromium/libxml_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libxml/libxml.gyp
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 105ab87692dc5d026705cf13343071d336e0f9c7..e7e4ac479e123e6d8d631df066278e49ca25cb80 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -20,7 +20,17 @@
'target_name': 'libxml',
'conditions': [
['os_posix == 1 and OS != "mac" and use_system_libxml', {
- 'type': 'none',
+ 'type': 'static_library',
+ 'sources': [
+ 'chromium/include/libxml/libxml_utils.h',
+ 'chromium/libxml_utils.cc',
+ ],
+ 'cflags': [
+ '<!@(pkg-config --cflags libxml-2.0)',
+ ],
+ 'include_dirs': [
+ 'chromium/include',
+ ],
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags libxml-2.0)',
@@ -28,6 +38,9 @@
'defines': [
Paweł Hajdan Jr. 2012/05/08 06:41:42 I think you should also have USE_SYSTEM_LIBXML def
dtu 2012/05/10 00:06:03 Done.
'USE_SYSTEM_LIBXML',
],
+ 'include_dirs': [
+ 'chromium/include',
+ ],
},
'link_settings': {
'ldflags': [
@@ -40,6 +53,8 @@
}, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
'type': 'static_library',
'sources': [
+ 'chromium/include/libxml/libxml_utils.h',
+ 'chromium/libxml_utils.cc',
'linux/config.h',
'linux/include/libxml/xmlversion.h',
'mac/config.h',
@@ -159,6 +174,7 @@
'include_dirs': [
'<(os_include)',
'<(os_include)/include',
+ 'chromium/include',
'src/include',
],
'dependencies': [
@@ -174,6 +190,7 @@
],
'include_dirs': [
'<(os_include)/include',
+ 'chromium/include',
'src/include',
],
},
« no previous file with comments | « third_party/libxml/chromium/libxml_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698