| 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 13 matching lines...) Expand all Loading... |
| 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)/lib.target/libSampleApp.so', | 34 '<(PRODUCT_DIR)/<(SHARED_LIB_DIR)/libSampleApp.so', |
| 35 '<(PRODUCT_DIR)/lib.target/libskia_android.so', | 35 '<(PRODUCT_DIR)/<(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 18 matching lines...) Expand all Loading... |
| 64 '<(android_base)/app/jni/com_skia_SkiaSampleRenderer.cpp', | 64 '<(android_base)/app/jni/com_skia_SkiaSampleRenderer.cpp', |
| 65 '<(android_base)/app/src/com/skia/SkiaSampleActivity.java', | 65 '<(android_base)/app/src/com/skia/SkiaSampleActivity.java', |
| 66 '<(android_base)/app/src/com/skia/SkiaSampleRenderer.java', | 66 '<(android_base)/app/src/com/skia/SkiaSampleRenderer.java', |
| 67 '<(android_base)/app/src/com/skia/SkiaSampleView.java', | 67 '<(android_base)/app/src/com/skia/SkiaSampleView.java', |
| 68 ], | 68 ], |
| 69 'outputs': [ | 69 'outputs': [ |
| 70 '<(PRODUCT_DIR)/../android/bin/SkiaAndroid.apk', | 70 '<(PRODUCT_DIR)/../android/bin/SkiaAndroid.apk', |
| 71 ], | 71 ], |
| 72 'action': [ | 72 'action': [ |
| 73 'ant', | 73 'ant', |
| 74 '-quiet', |
| 74 '-f', | 75 '-f', |
| 75 '<(android_base)/app/build.xml', | 76 '<(android_base)/app/build.xml', |
| 76 '-Dout.dir=<(PRODUCT_DIR)/android/bin', | 77 '-Dout.dir=<(PRODUCT_DIR)/android/bin', |
| 77 '-Dgen.absolute.dir=<(PRODUCT_DIR)/android/gen', | 78 '-Dgen.absolute.dir=<(PRODUCT_DIR)/android/gen', |
| 78 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', | 79 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', |
| 79 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', | 80 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', |
| 80 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', | 81 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', |
| 81 'debug', | 82 'debug', |
| 82 ], | 83 ], |
| 83 }, | 84 }, |
| 84 ], | 85 ], |
| 85 }, | 86 }, |
| 86 ], | 87 ], |
| 87 } | 88 } |
| OLD | NEW |