From 2e74eb03db87ed53376401071c32315f92d8e3b3 Mon Sep 17 00:00:00 2001 From: Bill Holmes Date: Fri, 20 Nov 2015 19:06:44 -0500 Subject: [PATCH] Fixing some duplicate symbols for the Xamarin.iOS build Both none_sources and armv7_sources were getting included in the iOS opts project. This is causing duplicate symbols when linking Xamarin.iOS simulator builds. I am not 100% this is the right fix. However we need to pick one or the other set of symbols. Going the armv7 ones. --- gyp/opts.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 396a37e..a072815 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -49,7 +49,7 @@ }], [ '(skia_arch_type == "arm" and arm_version < 7) \ - or (skia_os == "ios") \ + or (skia_os == "ios" and (skia_arch_type == "arm" and arm_version < 7)) \ or (skia_os == "android" \ and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \ "arm64"])', { -- 2.7.4