Update obvious deps.
This is a step toward targets declaring their deps in a sane fashion.
This change resolves cycles by forcing core to the root, then everything
in skia_lib pointing toward core as best possible, then everything
outside skia_lib depending on skia_lib for things in skia_lib. This
prevents double definitions where a symbol is provided by both the
skia_lib shared object and and a statically linked component of skia_lib.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/19823003
git-svn-id: http://skia.googlecode.com/svn/trunk@10231 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index a462ca4..f6d875c 100644
--- a/gyp/animator.gyp
+++ b/gyp/animator.gyp
@@ -9,16 +9,13 @@
'product_name': 'skia_animator',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'views.gyp:*',
+ 'xml.gyp:*',
+ ],
'include_dirs': [
'../include/animator',
- '../include/config',
- '../include/core',
- '../include/effects',
- '../include/images',
- '../include/lazy',
- '../include/utils',
- '../include/views',
- '../include/xml',
'../src/utils',
],
'sources': [
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index d69c820..d0b8b4d 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -6,15 +6,16 @@
'product_name': 'skia_effects',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ 'images.gyp:*',
+ 'utils.gyp:*',
+ ],
'includes': [
'effects.gypi',
],
'include_dirs': [
- '../include/config',
- '../include/core',
'../include/effects',
- '../include/lazy',
- '../include/utils',
'../src/core',
],
'direct_dependent_settings': {
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 3fdfb8e..6608aba 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -8,7 +8,6 @@
'target_name': 'gm_expectations',
'type': 'static_library',
'include_dirs' : [
- '../include/core/',
'../src/utils/',
],
'sources': [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index de0babd..df82cda 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -121,20 +121,19 @@
'product_name': 'skia_skgpu',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'angle.gyp:*',
+ 'core.gyp:*',
+ 'utils.gyp:*',
+ ],
'includes': [
'gpu.gypi',
],
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/utils',
- '../src/core',
'../include/gpu',
+ '../src/core',
'../src/gpu',
],
- 'dependencies': [
- 'angle.gyp:*',
- ],
'export_dependent_settings': [
'angle.gyp:*',
],
diff --git a/gyp/images.gyp b/gyp/images.gyp
index b2b404f..76df7d1 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -7,6 +7,7 @@
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
+ 'core.gyp:*',
'libjpeg.gyp:*',
'libwebp.gyp:libwebp',
'utils.gyp:utils',
@@ -15,8 +16,6 @@
'libjpeg.gyp:*',
],
'include_dirs': [
- '../include/config',
- '../include/core',
'../include/images',
'../include/lazy',
# for access to SkErrorInternals.h
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index bcc85a9..8aa5e0f 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -23,9 +23,10 @@
'product_name': 'skia_opts',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../src/core',
'../src/opts',
],
@@ -111,9 +112,10 @@
'product_name': 'skia_opts_ssse3',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../src/core',
],
'conditions': [
@@ -146,9 +148,10 @@
'product_name': 'skia_opts_neon',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../src/core',
'../src/opts',
],
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index f89df93..1efb984 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -10,9 +10,6 @@
'zlib.gyp:zlib',
],
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/images',
'../include/pdf',
'../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
'../src/utils', # needed to get SkBitSet.h
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 3fe8331..fa717e1 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -6,9 +6,10 @@
'product_name': 'skia_ports',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../include/effects',
'../include/images',
'../include/ports',
diff --git a/gyp/sfnt.gyp b/gyp/sfnt.gyp
index cc21b22..88ab94f 100644
--- a/gyp/sfnt.gyp
+++ b/gyp/sfnt.gyp
@@ -5,9 +5,10 @@
'product_name': 'skia_sfnt',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../src/sfnt',
],
'sources': [
diff --git a/gyp/svg.gyp b/gyp/svg.gyp
index 3952fd7..aed26a6 100644
--- a/gyp/svg.gyp
+++ b/gyp/svg.gyp
@@ -5,11 +5,11 @@
'product_name': 'skia_svg',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'xml.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/xml',
- '../include/utils',
'../include/svg',
],
'sources': [
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2ec5374..68bf6b6 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -6,9 +6,10 @@
'product_name': 'skia_utils',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'core.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../include/effects',
'../include/images',
'../include/lazy',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 182bb34..51ce0f0 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -11,19 +11,14 @@
'product_name': 'skia_views',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'angle.gyp:*',
+ 'xml.gyp:*',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/effects',
- '../include/images',
- '../include/lazy',
- '../include/utils',
'../include/views',
'../include/views/unix',
- '../include/xml',
- ],
- 'dependencies': [
- 'angle.gyp:*',
],
'sources': [
'../include/views/SkApplication.h',
diff --git a/gyp/views_animated.gyp b/gyp/views_animated.gyp
index 29e981d..4bfcb28 100644
--- a/gyp/views_animated.gyp
+++ b/gyp/views_animated.gyp
@@ -5,18 +5,16 @@
{
'target_name': 'views_animated',
'type': 'static_library',
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ 'angle.gyp:*',
+ 'animator.gyp:*',
+ 'views.gyp:*',
+ 'xml.gyp:*',
+ ],
'include_dirs': [
- '../include/animator',
- '../include/config',
- '../include/core',
- '../include/effects',
- '../include/images',
- '../include/lazy',
- '../include/utils',
- '../include/views',
'../include/views/animated',
'../include/views/unix',
- '../include/xml',
],
'sources': [
'../include/views/animated/SkBorderView.h',
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 2c4e06f..7c06b44 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -5,11 +5,11 @@
'product_name': 'skia_xml',
'type': 'static_library',
'standalone_static_library': 1,
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
+ ],
'include_dirs': [
- '../include/config',
- '../include/core',
'../include/xml',
- '../include/utils',
],
'sources': [
'../include/xml/SkBML_WXMLParser.h',
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index fcd0ac3..89d4470 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -3,9 +3,8 @@
{
'target_name': 'zlib',
'type': 'static_library',
- 'include_dirs': [
- '../include/config',
- '../include/core',
+ 'dependencies': [
+ 'skia_lib.gyp:skia_lib',
],
'sources': [
'../include/core/SkFlate.h',
diff --git a/src/animator/SkDisplayEvent.cpp b/src/animator/SkDisplayEvent.cpp
index 48529aa..a0cfcb1 100644
--- a/src/animator/SkDisplayEvent.cpp
+++ b/src/animator/SkDisplayEvent.cpp
@@ -250,77 +250,3 @@
}
return true;
}
-
-#ifdef SK_BUILD_FOR_ANDROID
-
-#include "SkMetaData.h"
-#include "SkParse.h"
-#include "SkTextBox.h"
-#include "SkXMLWriter.h"
-
-void SkMetaData::setPtr(char const*, void*, PtrProc ) {}
-void SkMetaData::setS32(char const*, int ) {}
-bool SkEventSink::doEvent(SkEvent const& ) { return false; }
-bool SkXMLParser::parse(SkStream& ) { return false; }
-SkXMLParserError::SkXMLParserError( ) {}
-void SkEvent::setType(char const*, size_t ) {}
-void SkEvent::postTime(SkMSec) {}
-SkEvent::SkEvent(char const*, SkEventSinkID) {}
-SkEvent::SkEvent(SkEvent const&) {}
-SkEvent::SkEvent( ) {}
-SkEvent::~SkEvent( ) {}
-bool SkEventSink::onQuery(SkEvent* ) { return false; }
-SkEventSink::SkEventSink( ) {}
-SkEventSink::~SkEventSink( ) {}
-bool SkXMLParser::parse(char const*, size_t ) { return false; }
-bool SkXMLParser::parse(SkDOM const&, SkDOMNode const* ) { return false; }
-//void SkParse::UnitTest( ) {}
-const char* SkMetaData::findString(char const* ) const {return 0;}
-bool SkMetaData::findPtr(char const*, void**, PtrProc* ) const {return false;}
-bool SkMetaData::findS32(char const*, int* ) const {return false;}
-bool SkEvent::isType(char const*, size_t ) const { return false; }
-void SkMetaData::setString(char const*, char const* ) {}
-const char* SkParse::FindNamedColor(char const*, size_t, SkColor* ) {return NULL; }
-const char* SkMetaData::Iter::next(SkMetaData::Type*, int* ) { return NULL; }
-SkMetaData::Iter::Iter(SkMetaData const& ) {}
-bool SkMetaData::findScalar(char const*, SkScalar* ) const {return false;}
-void SkMetaData::reset( ) {}
-void SkEvent::setType(SkString const& ) {}
-bool SkMetaData::findBool(char const*, bool* ) const {return false;}
-void SkEvent::getType(SkString*) const {}
-bool SkXMLParser::endElement(char const* ) { return false; }
-bool SkXMLParser::addAttribute(char const*, char const* ) { return false;}
-bool SkXMLParser::startElement(char const* ) { return false;}
-bool SkXMLParser::text(char const*, int ) { return false;}
-bool SkXMLParser::onText(char const*, int ) { return false;}
-SkXMLParser::SkXMLParser(SkXMLParserError* ) {}
-SkXMLParser::~SkXMLParser( ) {}
-SkXMLParserError::~SkXMLParserError( ) {}
-void SkXMLParserError::getErrorString(SkString*) const {}
-void SkTextBox::setSpacing(SkScalar, SkScalar ) {}
-void SkTextBox::setSpacingAlign(SkTextBox::SpacingAlign ) {}
-void SkTextBox::draw(SkCanvas*, char const*, size_t, SkPaint const& ) {}
-void SkTextBox::setBox(SkRect const& ) {}
-void SkTextBox::setMode(SkTextBox::Mode ) {}
-SkTextBox::SkTextBox( ) {}
-void SkMetaData::setScalar(char const*, SkScalar ) {}
-const char* SkParse::FindScalar(char const*, SkScalar* ) {return 0; }
-const char* SkParse::FindScalars(char const*, SkScalar*, int ) {return 0; }
-const char* SkParse::FindHex(char const*, unsigned int* ) {return 0; }
-const char* SkParse::FindS32(char const*, int* ) {return 0; }
-void SkXMLWriter::addAttribute(char const*, char const* ) {}
-void SkXMLWriter::startElement(char const* ) {}
-void SkXMLWriter::doEnd(SkXMLWriter::Elem* ) {}
-SkXMLWriter::Elem* SkXMLWriter::getEnd( ) { return 0; }
-bool SkXMLWriter::doStart(char const*, size_t ) { return false; }
-SkXMLWriter::SkXMLWriter(bool ) {}
-SkXMLWriter::~SkXMLWriter( ) {}
-SkMetaData::SkMetaData() {}
-SkMetaData::~SkMetaData() {}
-bool SkEventSink::onEvent(SkEvent const&) {return false;}
-bool SkXMLParser::onEndElement(char const*) {return false;}
-bool SkXMLParser::onAddAttribute(char const*, char const*) {return false;}
-bool SkXMLParser::onStartElement(char const*) {return false;}
-void SkXMLWriter::writeHeader() {}
-
-#endif