| 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 # NOTE: We tried adding the gyp file to the android/ directory at the root of | 10 # NOTE: We tried adding the gyp file to the android/ directory at the root of |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 '../third_party/externals/jpeg/jidctfst.c', | 144 '../third_party/externals/jpeg/jidctfst.c', |
| 145 '../third_party/externals/jpeg/jidctint.c', | 145 '../third_party/externals/jpeg/jidctint.c', |
| 146 '../third_party/externals/jpeg/jidctred.c', | 146 '../third_party/externals/jpeg/jidctred.c', |
| 147 '../third_party/externals/jpeg/jmem-android.c', | 147 '../third_party/externals/jpeg/jmem-android.c', |
| 148 '../third_party/externals/jpeg/jmemmgr.c', | 148 '../third_party/externals/jpeg/jmemmgr.c', |
| 149 '../third_party/externals/jpeg/jquant1.c', | 149 '../third_party/externals/jpeg/jquant1.c', |
| 150 '../third_party/externals/jpeg/jquant2.c', | 150 '../third_party/externals/jpeg/jquant2.c', |
| 151 '../third_party/externals/jpeg/jutils.c', | 151 '../third_party/externals/jpeg/jutils.c', |
| 152 ], | 152 ], |
| 153 'conditions': [ | 153 'conditions': [ |
| 154 [ 'arm_neon == 1', | 154 [ 'arm_neon == 1 and skia_clang_build == 0', |
| 155 { | 155 { |
| 156 'sources' : [ | 156 'sources' : [ |
| 157 '../third_party/externals/jpeg/armv6_idct.S', | 157 '../third_party/externals/jpeg/armv6_idct.S', |
| 158 '../third_party/externals/jpeg/jsimd_arm_neon.S', | 158 '../third_party/externals/jpeg/jsimd_arm_neon.S', |
| 159 '../third_party/externals/jpeg/jsimd_neon.c', | 159 '../third_party/externals/jpeg/jsimd_neon.c', |
| 160 ], | 160 ], |
| 161 'defines' : [ | 161 'defines' : [ |
| 162 'NV_ARM_NEON', | 162 'NV_ARM_NEON', |
| 163 ], | 163 ], |
| 164 }, | 164 }, |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 }], | 254 }], |
| 255 ], | 255 ], |
| 256 'sources': [ | 256 'sources': [ |
| 257 '../app/jni/com_skia_SkiaSampleRenderer.cpp', | 257 '../app/jni/com_skia_SkiaSampleRenderer.cpp', |
| 258 ], | 258 ], |
| 259 }, | 259 }, |
| 260 | 260 |
| 261 }, | 261 }, |
| 262 ] | 262 ] |
| 263 } | 263 } |
| OLD | NEW |