Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Unified Diff: platform_tools/android/gyp/dependencies.gypi

Issue 1093423003: Android's Clang toolchain can't assemble the JPEG's .S files. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698