Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: BUILD.gn

Issue 2248323002: Fix BUILD.gn for arch other then x86 and x64 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698