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

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

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 6 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
OLDNEW
1 { 1 {
2 'targets': [ 2 'targets': [
3 { 3 {
4 'target_name': 'CopySkiaAppDeps', 4 'target_name': 'CopySkiaAppDeps',
5 'type': 'none', 5 'type': 'none',
6 'dependencies': [ 6 'dependencies': [
7 'skia_lib.gyp:skia_lib',
7 'SampleApp.gyp:SampleApp', 8 'SampleApp.gyp:SampleApp',
8 'bench.gyp:bench', 9 'bench.gyp:bench',
9 'gm.gyp:gm', 10 'gm.gyp:gm',
10 'tests.gyp:tests', 11 'tests.gyp:tests',
11 'pathops_unittest.gyp:pathops_unittest', 12 'pathops_unittest.gyp:pathops_unittest',
12 'tools.gyp:bench_pictures', 13 'tools.gyp:bench_pictures',
13 'tools.gyp:render_pictures', 14 'tools.gyp:render_pictures',
14 'tools.gyp:render_pdfs', 15 'tools.gyp:render_pdfs',
15 'tools.gyp:skimage', 16 'tools.gyp:skimage'
borenet 2013/05/31 14:29:57 Nit: I really like having the comma after the last
16 ], 17 ],
17 'variables': { 18 'variables': {
18 'conditions': [ 19 'conditions': [
19 [ 'skia_arch_type == "x86"', { 20 [ 'skia_arch_type == "x86"', {
20 'android_arch%': "x86", 21 'android_arch%': "x86",
21 }, { 22 }, {
22 'conditions': [ 23 'conditions': [
23 [ 'armv7', { 24 [ 'armv7', {
24 'android_arch%': "armeabi-v7a", 25 'android_arch%': "armeabi-v7a",
25 }, { 26 }, {
(...skipping 23 matching lines...) Expand all
49 '<(PRODUCT_DIR)/lib.target/libbench.so', 50 '<(PRODUCT_DIR)/lib.target/libbench.so',
50 '<(PRODUCT_DIR)/lib.target/libbench_pictures.so', 51 '<(PRODUCT_DIR)/lib.target/libbench_pictures.so',
51 '<(PRODUCT_DIR)/lib.target/libgm.so', 52 '<(PRODUCT_DIR)/lib.target/libgm.so',
52 '<(PRODUCT_DIR)/lib.target/librender_pdfs.so', 53 '<(PRODUCT_DIR)/lib.target/librender_pdfs.so',
53 '<(PRODUCT_DIR)/lib.target/librender_pictures.so', 54 '<(PRODUCT_DIR)/lib.target/librender_pictures.so',
54 '<(PRODUCT_DIR)/lib.target/libSampleApp.so', 55 '<(PRODUCT_DIR)/lib.target/libSampleApp.so',
55 '<(PRODUCT_DIR)/lib.target/libskimage.so', 56 '<(PRODUCT_DIR)/lib.target/libskimage.so',
56 '<(PRODUCT_DIR)/lib.target/libtests.so', 57 '<(PRODUCT_DIR)/lib.target/libtests.so',
57 '<(PRODUCT_DIR)/lib.target/libpathops_unittest.so', 58 '<(PRODUCT_DIR)/lib.target/libpathops_unittest.so',
58 '<(PRODUCT_DIR)/lib.target/gdbserver', 59 '<(PRODUCT_DIR)/lib.target/gdbserver',
60 '<(PRODUCT_DIR)/lib.target/libskia_local.so',
59 ], 61 ],
60 }, 62 },
61 ], 63 ],
62 }, 64 },
63 { 65 {
64 'target_name': 'skia_launcher', 66 'target_name': 'skia_launcher',
65 'type': 'executable', 67 'type': 'executable',
66 'sources': [ 68 'sources': [
67 '../launcher/skia_launcher.cpp', 69 '../launcher/skia_launcher.cpp',
68 ], 70 ],
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', 108 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs',
107 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', 109 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk',
108 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', 110 '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
109 'debug', 111 'debug',
110 ], 112 ],
111 }, 113 },
112 ], 114 ],
113 }, 115 },
114 ], 116 ],
115 } 117 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698