Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # This GYP file stores the dependencies necessary to build Skia on the Android | 6 # This GYP file stores the dependencies necessary to build Skia on the Android |
| 7 # platform. The OS doesn't provide many stable libraries as part of the | 7 # platform. The OS doesn't provide many stable libraries as part of the |
| 8 # distribution so we have to build a few of them ourselves. | 8 # distribution so we have to build a few of them ourselves. |
| 9 # | 9 # |
| 10 { | 10 { |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 }], | 32 }], |
| 33 [ 'skia_arch_type == "mips32"', { | 33 [ 'skia_arch_type == "mips32"', { |
| 34 'android_arch%': "mips", | 34 'android_arch%': "mips", |
| 35 'android_variant%': "mips", | 35 'android_variant%': "mips", |
| 36 }], | 36 }], |
| 37 [ 'skia_arch_type == "mips64"', { | 37 [ 'skia_arch_type == "mips64"', { |
| 38 'android_arch%': "mips64", | 38 'android_arch%': "mips64", |
| 39 'android_variant%': "mips64", | 39 'android_variant%': "mips64", |
| 40 }], | 40 }], |
| 41 [ 'android_buildtype == "Release"', { | 41 [ 'android_buildtype == "Release"', { |
| 42 'android_apk_suffix': "release.apk", | 42 'android_apk_suffix': 'release.apk', |
| 43 'android_test_apk_suffix': 'release-androidTest.apk', | |
| 43 }, { | 44 }, { |
| 44 'android_apk_suffix': "debug.apk", | 45 'android_apk_suffix': 'debug.apk', |
| 46 'android_test_apk_suffix': 'debug-androidTest-unaligned.apk', | |
|
djsollen
2015/08/31 16:09:37
I'm not sure these new suffix variables are correc
djsollen
2015/08/31 16:16:08
Looking at it some more I think the changes to thi
borenet
2015/08/31 16:18:34
Yeah, I think you're right. Removed the changes t
| |
| 45 }], | 47 }], |
| 46 ], | 48 ], |
| 47 }, | 49 }, |
| 48 'targets': [ | 50 'targets': [ |
| 49 { | 51 { |
| 50 'target_name': 'CopySampleAppDeps', | 52 'target_name': 'CopySampleAppDeps', |
| 51 'type': 'none', | 53 'type': 'none', |
| 52 'dependencies': [ | 54 'dependencies': [ |
| 53 'skia_lib.gyp:skia_lib', | 55 'skia_lib.gyp:skia_lib', |
| 54 'SampleApp.gyp:SampleApp', | 56 'SampleApp.gyp:SampleApp', |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libv isualbench.so', | 193 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libv isualbench.so', |
| 192 ], | 194 ], |
| 193 'conditions': [ | 195 'conditions': [ |
| 194 [ 'skia_shared_lib', { | 196 [ 'skia_shared_lib', { |
| 195 'inputs': [ | 197 'inputs': [ |
| 196 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/ libskia_android.so', | 198 '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/ libskia_android.so', |
| 197 ], | 199 ], |
| 198 }], | 200 }], |
| 199 ], | 201 ], |
| 200 'outputs': [ | 202 'outputs': [ |
| 201 '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(an droid_variant)-debug-androidTest-unaligned.apk', | 203 '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-<(an droid_variant)-<(android_test_apk_suffix)', |
| 202 ], | 204 ], |
| 203 'action': [ | 205 'action': [ |
| 204 '<(android_base)/apps/gradlew', | 206 '<(android_base)/apps/gradlew', |
| 205 ':visualbench:assemble<(android_variant)DebugAndroidTest', | 207 ':visualbench:assemble<(android_variant)DebugAndroidTest', |
| 206 '-p<(android_base)/apps/visualbench', | 208 '-p<(android_base)/apps/visualbench', |
| 207 '-PsuppressNativeBuild', | 209 '-PsuppressNativeBuild', |
| 208 ], | 210 ], |
| 209 }, | 211 }, |
| 210 ], | 212 ], |
| 211 }, | 213 }, |
| 212 ], | 214 ], |
| 213 } | 215 } |
| OLD | NEW |