OLD | NEW |
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 12 matching lines...) Expand all Loading... |
23 ], | 23 ], |
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 'conditions': [ |
34 '<(SHARED_LIB_DIR)/libSampleApp.so', | 34 [ 'skia_shared_lib', { |
35 '<(SHARED_LIB_DIR)/libskia_android.so', | 35 'files': [ |
| 36 '<(SHARED_LIB_DIR)/libSampleApp.so', |
| 37 '<(SHARED_LIB_DIR)/libskia_android.so', |
| 38 ]}, { |
| 39 'files': [ |
| 40 '<(SHARED_LIB_DIR)/libSampleApp.so', |
| 41 ]} |
| 42 ], |
36 ], | 43 ], |
37 }, | 44 }, |
38 ], | 45 ], |
39 }, | 46 }, |
40 { | 47 { |
41 'target_name': 'skia_launcher', | 48 'target_name': 'skia_launcher', |
42 'type': 'executable', | 49 'type': 'executable', |
43 'sources': [ | 50 'sources': [ |
44 '../launcher/skia_launcher.cpp', | 51 '../launcher/skia_launcher.cpp', |
45 ], | 52 ], |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', | 86 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', |
80 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', | 87 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', |
81 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', | 88 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', |
82 'debug', | 89 'debug', |
83 ], | 90 ], |
84 }, | 91 }, |
85 ], | 92 ], |
86 }, | 93 }, |
87 ], | 94 ], |
88 } | 95 } |
OLD | NEW |