Index: gyp/dng_sdk.gyp |
diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp |
index be0c0f97db1673566d2eb3ef85a88863d093debd..05d6c25222bad2ca390d5ff7e1a8910c977702be 100644 |
--- a/gyp/dng_sdk.gyp |
+++ b/gyp/dng_sdk.gyp |
@@ -143,9 +143,9 @@ |
['skia_os != "linux"', { |
'sources': ['<@(headers)'], |
}], |
- ['skia_arch_type == "arm" and skia_clang_build', { |
+ ['(skia_arch_type == "arm" or skia_arch_type == "x86") and skia_clang_build', { |
# DNG SDK uses __builtin_smulll_overflow() to detect 64x64 bit multiply overflow. |
- # On ARMv7, Clang implements this with __mulodi4() in libclang_rt. |
+ # On ARMv7 and 32-bit x86, Clang implements this with __mulodi4() in libclang_rt. |
# I can't quite figure out how to link that here, so instead here's a shim for |
# __builtin_smulll_overflow() that multiplies normally assuming no overflow. |
# Tracked in b/29412086. |