Cleanup the XML directory in public includes.

gyp/xml.gyp

Index: gyp/xml.gyp
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 286a45c07316c5161516435bdbcab4ce3e2e0556..8c7c1fb9f296ac34640d7555f1143258c936ece3 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -6,7 +6,8 @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'skia_lib.gyp:skia_lib',
+        'core.gyp:core',
+        'utils.gyp:utils',

[borenet, 2014/11/13 21:01:26]

I thought we wanted to avoid dependencies on these "sub-libraries" and use
skia_lib instead?

[djsollen, 2014/11/13 21:06:55]

yeah, but in this case is causes a cycle as ports includes xml so you get.

skia_lib -> ports -> xml -> skia_lib

[bungeman-skia, 2014/11/13 21:50:25]

Doing things this way requires that this target be part of skia_lib. If ports is
using this, then that is a necessary thing anyway, but what in ports is using
this? I thought Android was just using expat directly?

       ],
       'include_dirs': [
         '../include/xml',
@@ -15,15 +16,12 @@
         '../include/xml/SkBML_WXMLParser.h',
         '../include/xml/SkBML_XMLParser.h',
         '../include/xml/SkDOM.h',
-        '../include/xml/SkJS.h',
         '../include/xml/SkXMLParser.h',
         '../include/xml/SkXMLWriter.h',
 
         '../src/xml/SkBML_Verbs.h',
         '../src/xml/SkBML_XMLParser.cpp',
         '../src/xml/SkDOM.cpp',
-        '../src/xml/SkJS.cpp',
-        '../src/xml/SkJSDisplayable.cpp',
         '../src/xml/SkXMLParser.cpp',
         '../src/xml/SkXMLPullParser.cpp',
         '../src/xml/SkXMLWriter.cpp',
@@ -31,16 +29,6 @@
       'sources!': [
           '../src/xml/SkXMLPullParser.cpp', #if 0 around class decl in header
       ],
-      'conditions': [
-        [ 'skia_os in ["win", "mac", "linux", "freebsd", "openbsd", "solaris", "android", "ios", "nacl", "chromeos"]', {
-          'sources!': [
-            # no jsapi.h by default on system
-            '../include/xml/SkJS.h',
-            '../src/xml/SkJS.cpp',
-            '../src/xml/SkJSDisplayable.cpp',
-          ],
-        }],
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/xml',