diff options
author | 2014-11-14 05:52:50 -0800 | |
---|---|---|
committer | 2014-11-14 05:52:50 -0800 | |
commit | 5ae776504fce25d320054390556526403068f103 (patch) | |
tree | 64b8e7e0e2471aac0c27f0eb947c4a4f9dc0a4b3 /gyp | |
parent | bc9431edc2a4be95c1c127381c9e9eaa3865b75e (diff) |
Cleanup the XML directory in public includes.
Review URL: https://codereview.chromium.org/722343002
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/apptype_console.gypi | 2 | ||||
-rw-r--r-- | gyp/core.gyp | 1 | ||||
-rw-r--r-- | gyp/experimental.gyp | 1 | ||||
-rw-r--r-- | gyp/ports.gyp | 2 | ||||
-rw-r--r-- | gyp/tools.gyp | 1 | ||||
-rw-r--r-- | gyp/utils.gyp | 1 | ||||
-rw-r--r-- | gyp/views.gyp | 5 | ||||
-rw-r--r-- | gyp/xml.gyp | 13 |
8 files changed, 4 insertions, 22 deletions
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index 53cadf5024..906bea814d 100644 --- a/gyp/apptype_console.gypi +++ b/gyp/apptype_console.gypi @@ -39,7 +39,6 @@ 'include_dirs' : [ '../experimental/iOSSampleApp/Shared', '../include/views', - '../include/xml', '../include/utils/mac', '../src/views/mac', ], @@ -55,7 +54,6 @@ ], 'dependencies': [ 'views.gyp:views', - 'xml.gyp:xml', ], 'link_settings': { 'libraries': [ diff --git a/gyp/core.gyp b/gyp/core.gyp index 91545ee0c3..e65baffc12 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -20,7 +20,6 @@ '../include/pipe', '../include/ports', '../include/utils', - '../include/xml', '../include/images', '../src/core', '../src/sfnt', diff --git a/gyp/experimental.gyp b/gyp/experimental.gyp index c3789fad57..96f9c5d67c 100644 --- a/gyp/experimental.gyp +++ b/gyp/experimental.gyp @@ -32,7 +32,6 @@ 'flags.gyp:flags', 'skia_lib.gyp:skia_lib', 'views.gyp:views', - 'xml.gyp:xml', ], 'conditions' : [ [ 'skia_gpu == 1', { diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 78d59dfe03..6d2a96882b 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -15,7 +15,6 @@ '../include/ports', '../include/utils', '../include/utils/win', - '../include/xml', '../src/core', '../src/lazy', '../src/ports', @@ -55,7 +54,6 @@ '../src/ports/SkTime_win.cpp', '../src/ports/SkTLS_pthread.cpp', '../src/ports/SkTLS_win.cpp', - '../src/ports/SkXMLParser_empty.cpp', '../include/ports/SkFontConfigInterface.h', '../include/ports/SkFontMgr.h', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 93ad0df389..bb8be20049 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -666,7 +666,6 @@ '<(skia_include_path)/views/SkOSWindow_Unix.h', '<(skia_include_path)/views/SkOSWindow_Win.h', '<(skia_include_path)/views/SkWindow.h', - '<(skia_include_path)/xml/SkJS.h', ], }, 'include_dirs': [ diff --git a/gyp/utils.gyp b/gyp/utils.gyp index e12c87a135..19816f88e4 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -22,7 +22,6 @@ '../include/utils/mac', '../include/utils/unix', '../include/utils/win', - '../include/xml', '../src/core', '../src/opts', '../src/utils', diff --git a/gyp/views.gyp b/gyp/views.gyp index f61c11a16e..55fb6dad22 100644 --- a/gyp/views.gyp +++ b/gyp/views.gyp @@ -13,7 +13,7 @@ 'standalone_static_library': 1, 'dependencies': [ 'skia_lib.gyp:skia_lib', - 'xml.gyp:*', + 'xml.gyp:xml', ], 'include_dirs': [ '../include/views', @@ -134,6 +134,9 @@ '../include/views', ], }, + 'export_dependent_settings': [ + 'xml.gyp:xml', + ], }, ], } diff --git a/gyp/xml.gyp b/gyp/xml.gyp index 286a45c073..aaceef2e66 100644 --- a/gyp/xml.gyp +++ b/gyp/xml.gyp @@ -15,15 +15,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 +28,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', |