| 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 == "arm" and arm_version != 7', { |
| 13 'android_arch%': "armeabi", |
| 14 }], |
| 15 [ 'skia_arch_type == "arm" and arm_version == 7', { |
| 16 'android_arch%': "armeabi-v7a", |
| 17 }], |
| 18 [ 'skia_arch_type == "arm64"', { |
| 19 'android_arch%': "arm64-v8a", |
| 20 }], |
| 21 [ 'skia_arch_type == "x86" and skia_arch_width == 32', { |
| 13 'android_arch%': "x86", | 22 'android_arch%': "x86", |
| 14 }, { | 23 }], |
| 15 'conditions': [ | 24 [ 'skia_arch_type == "x86" and skia_arch_width == 64', { |
| 16 [ 'arm_version == 7', { | 25 'android_arch%': "x86_64", |
| 17 'android_arch%': "armeabi-v7a", | 26 }], |
| 18 }, { | 27 [ 'skia_arch_type == "mips" and skia_arch_width == 32', { |
| 19 'android_arch%': "armeabi", | 28 'android_arch%': "mips", |
| 20 }], | 29 }], |
| 21 ], | 30 [ 'skia_arch_type == "mips" and skia_arch_width == 64', { |
| 31 'android_arch%': "mips64", |
| 22 }], | 32 }], |
| 23 ], | 33 ], |
| 24 }, | 34 }, |
| 25 'copies': [ | 35 'copies': [ |
| 26 # Copy all shared libraries into the Android app's libs folder. Note | 36 # Copy all shared libraries into the Android app's libs folder. Note |
| 27 # that this copy requires us to build SkiaAndroidApp after those | 37 # 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 | 38 # 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 | 39 # libraries to copy, this will cause an error in Make, but the app will |
| 30 # still build. | 40 # still build. |
| 31 { | 41 { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs', | 93 '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs', |
| 84 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk', | 94 '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk', |
| 85 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', | 95 '-Dsdk.dir=<(ANDROID_SDK_ROOT)', |
| 86 'debug', | 96 'debug', |
| 87 ], | 97 ], |
| 88 }, | 98 }, |
| 89 ], | 99 ], |
| 90 }, | 100 }, |
| 91 ], | 101 ], |
| 92 } | 102 } |
| OLD | NEW |