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

Side by Side Diff: platform_tools/android/gyp/dependencies.gypi

Issue 22617002: Update Skia Android tools. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: more fixes to make the bots happy Created 7 years, 4 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 | « platform_tools/android/bin/linux/perfhost ('k') | platform_tools/android/gyp/skia_android.gypi » ('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 # NOTE: We tried adding the gyp file to the android/ directory at the root of 5 # NOTE: We tried adding the 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 out directory. We may be able to move the bulk of this gyp 7 # outside of the out directory. We may be able to move the bulk of this gyp
8 # to the /android directory and put a simple shim here, but that has yet to be 8 # to the /android directory and put a simple shim here, but that has yet to be
9 # tested. 9 # tested.
10 10
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 # *after* all other definitions and conditionals are evaluated, so 206 # *after* all other definitions and conditionals are evaluated, so
207 # we're guaranteed that '_type' will be defined when we get here. 207 # we're guaranteed that '_type' will be defined when we get here.
208 # For more info, see: 208 # For more info, see:
209 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables 209 # - http://code.google.com/p/gyp/wiki/InputFormatReference#Variables
210 # - http://codereview.appspot.com/6353065/ 210 # - http://codereview.appspot.com/6353065/
211 ['_type == "executable"', { 211 ['_type == "executable"', {
212 'type': 'shared_library', 212 'type': 'shared_library',
213 }], 213 }],
214 ], 214 ],
215 }, 215 },
216 'sources': [
217 '../app/jni/com_skia_SkiaIntentService.cpp',
218 ],
219 }, 216 },
220 { 217 {
221 # This target is a dependency for Skia Sample application which runs on 218 # This target is a dependency for Skia Sample application which runs on
222 # Android. Since Android requires us to load native code in shared 219 # Android. Since Android requires us to load native code in shared
223 # libraries, we need a common entry point to wrap around main(). Here 220 # libraries, we need a common entry point to wrap around main(). Here
224 # we also change the type of all would-be executables to be shared 221 # we also change the type of all would-be executables to be shared
225 # libraries. The alternative would be to introduce a condition in every 222 # libraries. The alternative would be to introduce a condition in every
226 # executable target which changes to a shared library if the target OS is 223 # executable target which changes to a shared library if the target OS is
227 # Android. This is nicer because the switch is in one place. 224 # Android. This is nicer because the switch is in one place.
228 'target_name': 'Android_SampleApp', 225 'target_name': 'Android_SampleApp',
(...skipping 13 matching lines...) Expand all
242 }], 239 }],
243 ], 240 ],
244 'sources': [ 241 'sources': [
245 '../app/jni/com_skia_SkiaSampleRenderer.cpp', 242 '../app/jni/com_skia_SkiaSampleRenderer.cpp',
246 ], 243 ],
247 }, 244 },
248 245
249 }, 246 },
250 ] 247 ]
251 } 248 }
OLDNEW
« no previous file with comments | « platform_tools/android/bin/linux/perfhost ('k') | platform_tools/android/gyp/skia_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698