Index: gyp/opts.gyp |
diff --git a/gyp/opts.gyp b/gyp/opts.gyp |
index bd072cb1e8efff9744650a42b211eb537ff25a83..363095dbc4bcc712342db945f9859786b9f7cebf 100644 |
--- a/gyp/opts.gyp |
+++ b/gyp/opts.gyp |
@@ -1,3 +1,4 @@ |
+# Gyp file for opts projects |
{ |
'targets': [ |
# Due to an unfortunate intersection of lameness between gcc and gyp, |
@@ -97,7 +98,9 @@ |
}], |
], |
}], |
- [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', { |
+ [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \ |
+ or (skia_os == "ios") \ |
+ or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', { |
'sources': [ |
'../src/opts/SkBitmapProcState_opts_none.cpp', |
'../src/opts/SkBlitMask_opts_none.cpp', |