aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar anmittal <anmittal@chromium.org>2016-08-17 13:57:26 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-17 13:57:26 -0700
commita7eaf2e7e84ff10d1ed76b5d1e039c1a2d931392 (patch)
treefbd0086b2d4681eeece8a49ab89dbef20b739148
parentc3953afe5a1abca3392074f84eb0ff1390f92b81 (diff)
Fix BUILD.gn for arch other then x86 and x64
opts_gypi should only be defined for x86 and x64 else we get unused variable error BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2248323002 Review-Url: https://codereview.chromium.org/2248323002
-rw-r--r--BUILD.gn9
1 files changed, 8 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index b18cdd4f87..1c1cfec26e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -144,6 +144,11 @@ utils_gypi = exec_script("gn/gypi_to_gn.py",
"scope",
[ "gyp/utils.gypi" ])
+source_set("opts_none") {
+ configs += skia_library_configs
+ sources = opts_gypi.none_sources
+}
+
is_x86 = current_cpu == "x64" || current_cpu == "x86"
if (is_x86) {
@@ -199,6 +204,8 @@ component("skia") {
":opts_sse42",
":opts_ssse3",
]
+ } else {
+ deps += [ ":opts_none" ]
}
if (!is_win) {
@@ -530,8 +537,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/SkSVGLine.cpp",