Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index 1f43ca1c5892f0246750d64f8f8de0d62d922165..2ad2aab5c948116f44a612827d5e24f0da2e39d2 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -117,14 +117,17 @@ gpu_gypi = exec_script("gn/gypi_to_gn.py", |
"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", |
[ |
@@ -144,8 +147,6 @@ utils_gypi = exec_script("gn/gypi_to_gn.py", |
"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_
anmittal
2016/08/17 18:11:54
Done.
|
source_set("opts_sse2") { |
configs += skia_library_configs |
@@ -530,8 +531,8 @@ test_lib("experimental_svg_model") { |
sources = [ |
"experimental/svg/model/SkSVGAttribute.cpp", |
"experimental/svg/model/SkSVGAttributeParser.cpp", |
- "experimental/svg/model/SkSVGContainer.cpp", |
"experimental/svg/model/SkSVGCircle.cpp", |
+ "experimental/svg/model/SkSVGContainer.cpp", |
"experimental/svg/model/SkSVGDOM.cpp", |
"experimental/svg/model/SkSVGEllipse.cpp", |
"experimental/svg/model/SkSVGNode.cpp", |