| Index: platform_tools/android/gyp/dependencies.gypi
|
| diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
|
| index dca2438412aa79eb553e13a53afed390d3b56c48..3c6c423990c47dbe13b31f4bc10007a7ba2e9d37 100644
|
| --- a/platform_tools/android/gyp/dependencies.gypi
|
| +++ b/platform_tools/android/gyp/dependencies.gypi
|
| @@ -151,7 +151,7 @@
|
| '../third_party/externals/jpeg/jutils.c',
|
| ],
|
| 'conditions': [
|
| - [ 'arm_neon == 1',
|
| + [ 'arm_neon == 1 and skia_clang_build == 0',
|
| {
|
| 'sources' : [
|
| '../third_party/externals/jpeg/armv6_idct.S',
|
|
|