diff options
| author |  mtklein <mtklein@chromium.org> | 2015-04-21 12:07:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-21 12:07:38 -0700 |
| commit | d8afd50b5aed11e47280606e14f49a96b4288298 (patch) | |
| tree | 0d15eb12b1e16907037d0723216d50f2aa551dd9 /platform_tools | |
| parent | fd4167ddf12ea723b828462ec1507acebdef5776 (diff) | |
Android's Clang toolchain can't assemble the JPEG's .S files.
Only affecting Build-Mac10.8-Clang-Arm7-Debug-Android.
BUG=skia:
Review URL: https://codereview.chromium.org/1093423003
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi index dca2438412..3c6c423990 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', |