From: fmalita <fmalita@chromium.org>
Date: Thu, 14 Jul 2016 21:02:24 +0000 (-0700)
Subject: Build Expat on all platforms
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~116^2~808
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=771a190a0021d95500d73d4f187e0ef2aa3a0fdc;p=platform%2Fupstream%2FlibSkiaSharp.git

Build Expat on all platforms

* bump version to @android-6.0.1_r55 (2.1.1)

* add as a dependency to the 'xml' target (for upcoming http://crrev.com/2142893006)

* tweak build for Mac, Win:

  - define HAVE_EXPAT_CONFIG_H (same as in Android.mk)
  - use -Wno-missing-field-initializers (same as in Android.mk)
  - suppress MSVS warning 4244 (same as ..cmake/Utilities/cmexpat/expatConfig.h.in)

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2150603004
R=mtklein@google.com

Review-Url: https://codereview.chromium.org/2150603004
---

diff --git a/DEPS b/DEPS
index a1eddff..3dc7d1c 100644
--- a/DEPS
+++ b/DEPS
@@ -31,7 +31,7 @@ deps = {
   "third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b",
   "third_party/externals/yasm/binaries"             : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881",
 
-  "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-5.1.0_r3",
+  "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
 
 
   # The line below is needed for compiling SkV8Example. Do not delete.
diff --git a/gyp/expat.gyp b/gyp/expat.gyp
index 9e18383..90f7b02 100644
--- a/gyp/expat.gyp
+++ b/gyp/expat.gyp
@@ -4,15 +4,18 @@
 # found in the LICENSE file.
 
 # Build expat from source.
-# Used on Linux bots for testing the Android FontMgr xml parsing.
-# This is mostly important for the MSAN bot's instrumentation.
 
 {
     'targets': [{
         'target_name': 'expat',
         'type': 'static_library',
-        'cflags': [ '-w' ],
-        'defines': [ 'HAVE_MEMMOVE' ],
+        'cflags': [ '-Wno-missing-field-initializers' ],
+        'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-missing-field-initializers', ], },
+        'msvs_disabled_warnings': [4244],
+        'defines': [ 'HAVE_EXPAT_CONFIG_H' ],
+        'include_dirs': [
+             '../third_party/externals/expat',
+        ],
         'sources': [
             '../third_party/externals/expat/lib/xmlparse.c',
             '../third_party/externals/expat/lib/xmlrole.c',
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 36acf97..8060076 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -11,6 +11,7 @@
       'standalone_static_library': 1,
       'dependencies': [
         'skia_lib.gyp:skia_lib',
+        'expat.gyp:expat',
       ],
       'include_dirs': [
         '../include/private',