diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-02 12:27:21 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-02 12:27:21 +0000 |
| commit | 4b32101a1562ef73829994a82d46f72f3f0791d0 (patch) | |
| tree | 576c5b2182635d1fb98c57a4a579e8c3122a9c72 /platform_tools | |
| parent | 99da601032e4a5808ea33adc1cc721f79b73e4ca (diff) | |
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
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/DEPS | 17 | ||||
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 4 |
2 files changed, 2 insertions, 19 deletions
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', ], }, |