From 899f1d854a20c164dba5c3712ad63f8bb6b910ba Mon Sep 17 00:00:00 2001
From: "bungeman@google.com"
<bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Sat, 20 Jul 2013 00:24:35 +0000
Subject: [PATCH] Revert deps changes in r10220 and r10217.
Need to avoid linking in .a things which are already provided by .so things.
git-svn-id: http://skia.googlecode.com/svn/trunk@10222 2bbb7eff-a529-9590-31e7-b0007b416f81
---
gyp/animator.gyp | 16 ++++++++--------
gyp/effects.gyp | 9 ++++-----
gyp/gpu.gyp | 13 +++++++------
gyp/images.gyp | 3 ++-
gyp/opts.gyp | 15 ++++++---------
gyp/pdf.gyp | 3 +++
gyp/ports.gyp | 5 ++---
gyp/sfnt.gyp | 5 ++---
gyp/svg.gyp | 9 ++++-----
gyp/utils.gyp | 5 ++---
gyp/views.gyp | 18 ++++++++++--------
gyp/views_animated.gyp | 19 ++++++++-----------
gyp/xml.gyp | 7 +++----
gyp/zlib.gyp | 5 +++--
14 files changed, 64 insertions(+), 68 deletions(-)
diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index 609d52e39..a462ca4a2 100644
--- a/gyp/animator.gyp
+++ b/gyp/animator.gyp
@@ -9,16 +9,16 @@
'product_name': 'skia_animator',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'core.gyp:*',
- 'effects.gyp:*',
- 'images.gyp:*',
- 'utils.gyp:*',
- '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 d0b8b4d77..d69c82035 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -6,16 +6,15 @@
'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/gpu.gyp b/gyp/gpu.gyp
index df82cdadd..de0babde7 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -121,19 +121,20 @@
'product_name': 'skia_skgpu',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'angle.gyp:*',
- 'core.gyp:*',
- 'utils.gyp:*',
- ],
'includes': [
'gpu.gypi',
],
'include_dirs': [
- '../include/gpu',
+ '../include/config',
+ '../include/core',
+ '../include/utils',
'../src/core',
+ '../include/gpu',
'../src/gpu',
],
+ 'dependencies': [
+ 'angle.gyp:*',
+ ],
'export_dependent_settings': [
'angle.gyp:*',
],
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 76df7d178..b2b404f00 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -7,7 +7,6 @@
'type': 'static_library',
'standalone_static_library': 1,
'dependencies': [
- 'core.gyp:*',
'libjpeg.gyp:*',
'libwebp.gyp:libwebp',
'utils.gyp:utils',
@@ -16,6 +15,8 @@
'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 8aa5e0f6b..bcc85a9ba 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -23,10 +23,9 @@
'product_name': 'skia_opts',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'core.gyp:*',
- ],
'include_dirs': [
+ '../include/config',
+ '../include/core',
'../src/core',
'../src/opts',
],
@@ -112,10 +111,9 @@
'product_name': 'skia_opts_ssse3',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'core.gyp:*',
- ],
'include_dirs': [
+ '../include/config',
+ '../include/core',
'../src/core',
],
'conditions': [
@@ -148,10 +146,9 @@
'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 1efb9848a..f89df933a 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -10,6 +10,9 @@
'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 1c7c33ed8..0e579853b 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -6,10 +6,9 @@
'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 88ab94f83..cc21b222b 100644
--- a/gyp/sfnt.gyp
+++ b/gyp/sfnt.gyp
@@ -5,10 +5,9 @@
'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 c161ef5d8..3952fd775 100644
--- a/gyp/svg.gyp
+++ b/gyp/svg.gyp
@@ -5,12 +5,11 @@
'product_name': 'skia_svg',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'core.gyp:*',
- 'utils.gyp:*',
- '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 68bf6b6b5..2ec5374bd 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -6,10 +6,9 @@
'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 2957fed77..182bb34ee 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -11,17 +11,19 @@
'product_name': 'skia_views',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'angle.gyp:*',
- 'core.gyp:*',
- 'effects.gyp:*',
- 'images.gyp:*',
- 'utils.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 b0b02339a..29e981d15 100644
--- a/gyp/views_animated.gyp
+++ b/gyp/views_animated.gyp
@@ -5,21 +5,18 @@
{
'target_name': 'views_animated',
'type': 'static_library',
- 'dependencies': [
- 'angle.gyp:*',
- #'animator.gyp:*', #commented out until Android is fixed
- 'core.gyp:*',
- 'effects.gyp:*',
- 'images.gyp:*',
- 'utils.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 e75dd4c8b..2c4e06f8d 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -5,12 +5,11 @@
'product_name': 'skia_xml',
'type': 'static_library',
'standalone_static_library': 1,
- 'dependencies': [
- 'core.gyp:*',
- 'utils.gyp:*',
- ],
'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 1423c04ba..fcd0ac3b4 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -3,8 +3,9 @@
{
'target_name': 'zlib',
'type': 'static_library',
- 'dependencies': [
- 'core.gyp:*',
+ 'include_dirs': [
+ '../include/config',
+ '../include/core',
],
'sources': [
'../include/core/SkFlate.h',
--
GitLab