diff options
| -rw-r--r-- | DEPS | 9 | ||||
| -rw-r--r-- | gyp/android_deps.gyp | 2 | ||||
| -rw-r--r-- | gyp/android_system.gyp | 2 | ||||
| -rw-r--r-- | platform_tools/android/DEPS | 17 | ||||
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 4 |
5 files changed, 13 insertions, 21 deletions
@@ -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 ea7bbf2c13..cd5b1b0c69 100644 --- 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 57f973a43f..af2492c800 100644 --- 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 index 82ca5595f5..0000000000 --- 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 031e9c2035..75ff5f3362 100644 --- 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', ], }, |