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

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

Issue 25319003: fix the android build. now both android_ninja _and_ android_make work. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'CopySampleAppDeps', 4 'target_name': 'CopySampleAppDeps',
5 'type': 'none', 5 'type': 'none',
6 'dependencies': [ 6 'dependencies': [
7 'skia_lib.gyp:skia_lib', 7 'skia_lib.gyp:skia_lib',
8 'SampleApp.gyp:SampleApp', 8 'SampleApp.gyp:SampleApp',
9 ], 9 ],
10 'variables': { 10 'variables': {
(...skipping 13 matching lines...) Expand all
24 }, 24 },
25 'copies': [ 25 'copies': [
26 # Copy all shared libraries into the Android app's libs folder. Note 26 # Copy all shared libraries into the Android app's libs folder. Note
27 # that this copy requires us to build SkiaAndroidApp after those 27 # that this copy requires us to build SkiaAndroidApp after those
28 # libraries, so that they exist by the time it occurs. If there are no 28 # libraries, so that they exist by the time it occurs. If there are no
29 # libraries to copy, this will cause an error in Make, but the app will 29 # libraries to copy, this will cause an error in Make, but the app will
30 # still build. 30 # still build.
31 { 31 {
32 'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)', 32 'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)',
33 'files': [ 33 'files': [
34 '<(PRODUCT_DIR)/<(SHARED_LIB_DIR)/libSampleApp.so', 34 '<(SHARED_LIB_DIR)/libSampleApp.so',
35 '<(PRODUCT_DIR)/<(SHARED_LIB_DIR)/libskia_android.so', 35 '<(SHARED_LIB_DIR)/libskia_android.so',
36 ], 36 ],
37 }, 37 },
38 ], 38 ],
39 }, 39 },
40 { 40 {
41 'target_name': 'skia_launcher', 41 'target_name': 'skia_launcher',
42 'type': 'executable', 42 'type': 'executable',
43 'sources': [ 43 'sources': [
44 '../launcher/skia_launcher.cpp', 44 '../launcher/skia_launcher.cpp',
45 ], 45 ],
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', 79 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs',
80 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', 80 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk',
81 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', 81 '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
82 'debug', 82 'debug',
83 ], 83 ],
84 }, 84 },
85 ], 85 ],
86 }, 86 },
87 ], 87 ],
88 } 88 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698