Fix BUILD.gn for arch other then x86 and x64

BUILD.gn

 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 declare_args() {
 }
 
 skia_public_includes = [
   "include/android",
@@ skipping 99 matching lines @@
 
 gpu_gypi = exec_script("gn/gypi_to_gn.py",
                        [
                          rebase_path("gyp/gpu.gypi"),
                          "--replace=<(skia_include_path)=include",
                          "--replace=<(skia_src_path)=src",
                        ],
                        "scope",
                        [ "gyp/gpu.gypi" ])
 
-opts_gypi = exec_script("gn/gypi_to_gn.py",
-                        [
-                          rebase_path("gyp/opts.gypi"),
-                          "--replace=<(skia_include_path)=include",
-                          "--replace=<(skia_src_path)=src",
-                        ],
-                        "scope",
-                        [ "gyp/opts.gypi" ])
+is_x86 = current_cpu == "x64" || current_cpu == "x86"
+if (is_x86) {
+  opts_gypi = exec_script("gn/gypi_to_gn.py",
+                          [
+                            rebase_path("gyp/opts.gypi"),
+                            "--replace=<(skia_include_path)=include",
+                            "--replace=<(skia_src_path)=src",
+                          ],
+                          "scope",
+                          [ "gyp/opts.gypi" ])
+}
 
 pdf_gypi = exec_script("gn/gypi_to_gn.py",
                        [
                          rebase_path("gyp/pdf.gypi"),
                          "--replace=<(skia_include_path)=include",
                          "--replace=<(skia_src_path)=src",
                        ],
                        "scope",
                        [ "gyp/pdf.gypi" ])
 
 utils_gypi = exec_script("gn/gypi_to_gn.py",
                          [
                            rebase_path("gyp/utils.gypi"),
                            "--replace=<(skia_include_path)=include",
                            "--replace=<(skia_src_path)=src",
                          ],
                          "scope",
                          [ "gyp/utils.gypi" ])
 
-is_x86 = current_cpu == "x64" || current_cpu == "x86"
-
 if (is_x86) {

[mtklein, 2016/08/17 12:43:39]

Let's try to fix this differently, by adding opts_none here using
sources=opts_gypi.none_sources and no extra cflags.
Then we should depend on opts_none in an else branch of if (is_x86) { deps +=
... } below.

[anmittal, 2016/08/17 18:11:54]

Done.

   source_set("opts_sse2") {
     configs += skia_library_configs
     sources = opts_gypi.sse2_sources
     cflags = [ "-msse2" ]
   }
 
   source_set("opts_ssse3") {
     configs += skia_library_configs
     sources = opts_gypi.ssse3_sources
     cflags = [ "-mssse3" ]
@@ skipping 363 matching lines @@
     ":skia",
     ":tool_utils",
   ]
 }
 
 test_lib("experimental_svg_model") {
   public_include_dirs = [ "experimental/svg/model" ]
   sources = [
     "experimental/svg/model/SkSVGAttribute.cpp",
     "experimental/svg/model/SkSVGAttributeParser.cpp",
+    "experimental/svg/model/SkSVGCircle.cpp",
     "experimental/svg/model/SkSVGContainer.cpp",
-    "experimental/svg/model/SkSVGCircle.cpp",
     "experimental/svg/model/SkSVGDOM.cpp",
     "experimental/svg/model/SkSVGEllipse.cpp",
     "experimental/svg/model/SkSVGNode.cpp",
     "experimental/svg/model/SkSVGPath.cpp",
     "experimental/svg/model/SkSVGPoly.cpp",
     "experimental/svg/model/SkSVGRect.cpp",
     "experimental/svg/model/SkSVGRenderContext.cpp",
     "experimental/svg/model/SkSVGSVG.cpp",
     "experimental/svg/model/SkSVGShape.cpp",
     "experimental/svg/model/SkSVGTransformableNode.cpp",
@@ skipping 58 matching lines @@
       "tools/SkShaper_harfbuzz.cpp",
       "tools/using_skia_and_harfbuzz.cpp",
     ]
     deps = [
       ":skia",
       "//third_party/harfbuzz",
     ]
     testonly = true
   }
 }