Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: gyp/android_system.gyp

Issue 13898019: Update DEPS and GYP to use the copy of Android in platform_tools. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gyp/android_deps.gyp ('k') | platform_tools/android/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This GYP file stores the dependencies necessary to build Skia on the Android 1 # This GYP file stores the dependencies necessary to build Skia on the Android
2 # platform. The OS doesn't provide many stable libraries as part of the 2 # platform. The OS doesn't provide many stable libraries as part of the
3 # distribution so we have to build a few of them ourselves. 3 # distribution so we have to build a few of them ourselves.
4 # 4 #
5 # We tried adding this gyp file to the android directory at the root of 5 # We tried adding this gyp file to the android directory at the root of
6 # the Skia repo, but that resulted in the generated makefiles being created 6 # the Skia repo, but that resulted in the generated makefiles being created
7 # outside of the intended output directory. So to avoid this we created a simple 7 # outside of the intended output directory. So to avoid this we created a simple
8 # shim here that includes the android_system.gypi file. The actual dependencies 8 # shim here that includes the android_system.gypi file. The actual dependencies
9 # are defined and maintained in that gypi file. 9 # are defined and maintained in that gypi file.
10 # 10 #
11 # Also this assumes that the android directory is a sibling to the directory 11 # Also this assumes that the android directory is a sibling to the directory
12 # that contains your primary Skia checkout. If it is not then you must manually 12 # that contains your primary Skia checkout. If it is not then you must manually
13 # edit the includes below to specify the actual location of the android.gypi. 13 # edit the includes below to specify the actual location of the android.gypi.
14 # This is due to the fact that we cannot use variables in an includes as the 14 # This is due to the fact that we cannot use variables in an includes as the
15 # variable expansion step for gyp happens after the includes are processed. 15 # variable expansion step for gyp happens after the includes are processed.
16 { 16 {
17 'includes': [ 17 'includes': [
18 '../../android/gyp/skia_android.gypi', 18 '../platform_tools/android/gyp/skia_android.gypi',
19 ], 19 ],
20 } 20 }
OLDNEW
« no previous file with comments | « gyp/android_deps.gyp ('k') | platform_tools/android/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698