From af73091b560cc8e99df321a7413421919ccbc704 Mon Sep 17 00:00:00 2001
From: "borenet@google.com"
 <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 9 Aug 2012 15:54:28 +0000
Subject: [PATCH] Set bench/gm/tests as explicit dependencies of SkiaAndroidApp
 (trunk)

Hopefully this fixes the flaky Android build.
Review URL: https://codereview.appspot.com/6461067

git-svn-id: http://skia.googlecode.com/svn/trunk@5032 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 gyp/android_deps.gyp     | 20 ++++++++++++++++++++
 gyp/apptype_console.gypi |  2 +-
 gyp/core.gyp             |  2 +-
 gyp/images.gyp           |  4 ++--
 gyp/ports.gyp            |  4 ++--
 5 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 gyp/android_deps.gyp

diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
new file mode 100644
index 0000000000..122f2c3a37
--- /dev/null
+++ b/gyp/android_deps.gyp
@@ -0,0 +1,20 @@
+# This GYP file stores the dependencies necessary to build Skia on the Android
+# platform. The OS doesn't provide many stable libraries as part of the
+# distribution so we have to build a few of them ourselves.  
+#
+# We tried adding this gyp file to the android directory at the root of 
+# the Skia repo, but that resulted in the generated makefiles being created
+# outside of the intended output directory. So to avoid this we created a simple
+# shim here that includes the android_deps.gypi file.  The actual dependencies
+# are defined and maintained in that gypi file.  
+# 
+# Also this assumes that the android directory is a sibling to the directory
+# that contains your primary Skia checkout. If it is not then you must manually
+# edit the includes below to specify the actual location of the android.gypi.
+# This is due to the fact that we cannot use variables in an includes as the
+# variable expansion step for gyp happens after the includes are processed. 
+{
+  'includes': [
+    '../../android/gyp/dependencies.gypi',
+  ],
+}
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index 62f1b9fc07..229db0d95e 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -14,7 +14,7 @@
     'conditions': [
       [ 'skia_os == "android" and android_make_apk == 1', {
         'dependencies': [
-          'android_system.gyp:Android_EntryPoint',
+          'android_deps.gyp:Android_EntryPoint',
         ],
       }],
     ],
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 0be1ad5b54..47a46ac3b8 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -76,7 +76,7 @@
         }],
         [ 'skia_os == "android"', {
           'dependencies': [
-             'android_system.gyp:ft2',
+             'android_deps.gyp:ft2',
           ],
         }],
         [ 'skia_os == "android" and skia_arch_type == "arm" and armv7 == 1', {
diff --git a/gyp/images.gyp b/gyp/images.gyp
index b92c9db34d..24c70a1b75 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -109,8 +109,8 @@
           'sources!': [
           ],
           'dependencies': [
-             'android_system.gyp:gif',
-             'android_system.gyp:png',
+             'android_deps.gyp:gif',
+             'android_deps.gyp:png',
           ],
           'defines': [
             'SK_ENABLE_LIBPNG',
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index b9c1412a85..3272ac9ba2 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -96,8 +96,8 @@
             #TODO: include the ports/SkImageRef_ashmem.cpp for non-NDK builds
           ],
           'dependencies': [
-             'android_system.gyp:ft2',
-             'android_system.gyp:expat',
+             'android_deps.gyp:ft2',
+             'android_deps.gyp:expat',
           ],
         }],        
       ],