| 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': { |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 [ 'skia_arch_type == "x86"', { | 12 [ 'skia_arch_type == "x86"', { |
| 13 'android_arch%': "x86", | 13 'android_arch%': "x86", |
| 14 }, { | 14 }, { |
| 15 'conditions': [ | 15 'conditions': [ |
| 16 [ 'arm_version == 7', { | 16 [ 'arm_version == 7', { |
| 17 'android_arch%': "armeabi-v7a", | 17 'android_arch%': "armeabi-v7a", |
| 18 }, { | 18 }, { |
| 19 'android_arch%': "armeabi", | 19 'android_arch%': "armeabi", |
| 20 }], | 20 }], |
| 21 ], | 21 ], |
| 22 }], | 22 }], |
| 23 ], | 23 ], |
| 24 }, | 24 }, |
| 25 'copies': [ | 25 'copies': [ |
| 26 # Copy gdbserver into the lib.target directory, so that it gets packaged | |
| 27 # in the APK. This is necessary for debugging. | |
| 28 { | |
| 29 'destination': '<(PRODUCT_DIR)/lib.target', | |
| 30 'files': [ | |
| 31 '<(android_base)/toolchains/<(android_toolchain)/gdbserver', | |
| 32 ], | |
| 33 }, | |
| 34 # 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 |
| 35 # that this copy requires us to build SkiaAndroidApp after those | 27 # that this copy requires us to build SkiaAndroidApp after those |
| 36 # 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 |
| 37 # 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 |
| 38 # still build. | 30 # still build. |
| 39 { | 31 { |
| 40 'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)', | 32 'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)', |
| 41 'files': [ | 33 'files': [ |
| 42 '<(PRODUCT_DIR)/lib.target/libSampleApp.so', | 34 '<(PRODUCT_DIR)/lib.target/libSampleApp.so', |
| 43 '<(PRODUCT_DIR)/lib.target/gdbserver', | |
| 44 '<(PRODUCT_DIR)/lib.target/libskia_android.so', | 35 '<(PRODUCT_DIR)/lib.target/libskia_android.so', |
| 45 ], | 36 ], |
| 46 }, | 37 }, |
| 47 ], | 38 ], |
| 48 }, | 39 }, |
| 49 { | 40 { |
| 50 'target_name': 'skia_launcher', | 41 'target_name': 'skia_launcher', |
| 51 'type': 'executable', | 42 'type': 'executable', |
| 52 'sources': [ | 43 'sources': [ |
| 53 '../launcher/skia_launcher.cpp', | 44 '../launcher/skia_launcher.cpp', |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', | 78 '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs', |
| 88 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', | 79 '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk', |
| 89 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', | 80 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', |
| 90 'debug', | 81 'debug', |
| 91 ], | 82 ], |
| 92 }, | 83 }, |
| 93 ], | 84 ], |
| 94 }, | 85 }, |
| 95 ], | 86 ], |
| 96 } | 87 } |
| OLD | NEW |