Update DEPS and GYP to use the copy of Android in platform_tools.

R=borenet@google.com

Review URL: https://codereview.chromium.org/13898019

git-svn-id: http://skia.googlecode.com/svn/trunk@8951 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/DEPS b/DEPS
index 6ade579..4a26a46 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -18,6 +18,15 @@ deps = {
   "third_party/externals/libwebp" : "http://src.chromium.org/svn/trunk/src/third_party/libwebp@186718",
 }
 
+deps_os = {
+  "android": {
+    "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git",
+    "platform_tools/android/third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git",
+    "platform_tools/android/third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git",
+    "platform_tools/android/third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git",
+  },
+}
+
 #hooks = [
 #  {
 #    # A change to a .gyp, .gypi, or to GYP itself should run the generator.

diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index ea7bbf2..cd5b1b0 100644 (file)
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -15,6 +15,6 @@
 # variable expansion step for gyp happens after the includes are processed.
 {
   'includes': [
-    '../../android/gyp/dependencies.gypi',
+    '../platform_tools/android/gyp/dependencies.gypi',
   ],
 }

diff --git a/gyp/android_system.gyp b/gyp/android_system.gyp
index 57f973a..af2492c 100644 (file)
--- a/gyp/android_system.gyp
+++ b/gyp/android_system.gyp
@@ -15,6 +15,6 @@
 # variable expansion step for gyp happens after the includes are processed.
 {
   'includes': [
-    '../../android/gyp/skia_android.gypi',
+    '../platform_tools/android/gyp/skia_android.gypi',
   ],
 }

diff --git a/platform_tools/android/DEPS b/platform_tools/android/DEPS
deleted file mode 100644 (file)
index 82ca559..0000000
--- a/platform_tools/android/DEPS
+++ /dev/null
@@ -1,17 +0,0 @@
-use_relative_paths = True
-
-# Dependencies on external packages.
-deps = {
-  "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git",
-  "third_party/externals/gif" : "https://android.googlesource.com/platform/external/giflib.git",
-  "third_party/externals/png" : "https://android.googlesource.com/platform/external/libpng.git",
-  "third_party/externals/jpeg" : "https://android.googlesource.com/platform/external/jpeg.git",
-}
-
-#hooks = [
-#  {
-#    # A change to a .gyp, .gypi, or to GYP itself should run the generator.
-#    "pattern": ".",
-#    "action": ["python", "trunk/gyp_skia"],
-#  },
-#]

diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 031e9c2..75ff5f3 100644 (file)
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -223,7 +223,7 @@
         ],
       },
       'sources': [
-        '../../android/app/jni/com_skia_SkiaIntentService.cpp',
+        '../app/jni/com_skia_SkiaIntentService.cpp',
       ],
     },
     {
@@ -251,7 +251,7 @@
           }],
         ],
         'sources': [
-          '../../android/app/jni/com_skia_SkiaSampleRenderer.cpp',
+          '../app/jni/com_skia_SkiaSampleRenderer.cpp',
         ],
       },