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

Side by Side 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: Fixed accoring to mtklein's comments 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 Google Inc. 1 # Copyright 2016 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 declare_args() { 6 declare_args() {
7 } 7 }
8 8
9 skia_public_includes = [ 9 skia_public_includes = [
10 "include/android", 10 "include/android",
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 utils_gypi = exec_script("gn/gypi_to_gn.py", 138 utils_gypi = exec_script("gn/gypi_to_gn.py",
139 [ 139 [
140 rebase_path("gyp/utils.gypi"), 140 rebase_path("gyp/utils.gypi"),
141 "--replace=<(skia_include_path)=include", 141 "--replace=<(skia_include_path)=include",
142 "--replace=<(skia_src_path)=src", 142 "--replace=<(skia_src_path)=src",
143 ], 143 ],
144 "scope", 144 "scope",
145 [ "gyp/utils.gypi" ]) 145 [ "gyp/utils.gypi" ])
146 146
147 source_set("opts_none") {
148 configs += skia_library_configs
149 sources = opts_gypi.none_sources
150 }
151
147 is_x86 = current_cpu == "x64" || current_cpu == "x86" 152 is_x86 = current_cpu == "x64" || current_cpu == "x86"
148 153
149 if (is_x86) { 154 if (is_x86) {
150 source_set("opts_sse2") { 155 source_set("opts_sse2") {
151 configs += skia_library_configs 156 configs += skia_library_configs
152 sources = opts_gypi.sse2_sources 157 sources = opts_gypi.sse2_sources
153 cflags = [ "-msse2" ] 158 cflags = [ "-msse2" ]
154 } 159 }
155 160
156 source_set("opts_ssse3") { 161 source_set("opts_ssse3") {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 "//third_party/zlib", 197 "//third_party/zlib",
193 ] 198 ]
194 if (is_x86) { 199 if (is_x86) {
195 deps += [ 200 deps += [
196 ":opts_avx", 201 ":opts_avx",
197 ":opts_sse2", 202 ":opts_sse2",
198 ":opts_sse41", 203 ":opts_sse41",
199 ":opts_sse42", 204 ":opts_sse42",
200 ":opts_ssse3", 205 ":opts_ssse3",
201 ] 206 ]
207 } else {
208 deps += [ ":opts_none" ]
202 } 209 }
203 210
204 if (!is_win) { 211 if (!is_win) {
205 libs = [ "pthread" ] 212 libs = [ "pthread" ]
206 } 213 }
207 214
208 sources = [] 215 sources = []
209 sources += core_gypi.sources 216 sources += core_gypi.sources
210 sources += effects_gypi.sources 217 sources += effects_gypi.sources
211 sources += gpu_gypi.skgpu_sources 218 sources += gpu_gypi.skgpu_sources
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 ":skia", 530 ":skia",
524 ":tool_utils", 531 ":tool_utils",
525 ] 532 ]
526 } 533 }
527 534
528 test_lib("experimental_svg_model") { 535 test_lib("experimental_svg_model") {
529 public_include_dirs = [ "experimental/svg/model" ] 536 public_include_dirs = [ "experimental/svg/model" ]
530 sources = [ 537 sources = [
531 "experimental/svg/model/SkSVGAttribute.cpp", 538 "experimental/svg/model/SkSVGAttribute.cpp",
532 "experimental/svg/model/SkSVGAttributeParser.cpp", 539 "experimental/svg/model/SkSVGAttributeParser.cpp",
540 "experimental/svg/model/SkSVGCircle.cpp",
533 "experimental/svg/model/SkSVGContainer.cpp", 541 "experimental/svg/model/SkSVGContainer.cpp",
534 "experimental/svg/model/SkSVGCircle.cpp",
535 "experimental/svg/model/SkSVGDOM.cpp", 542 "experimental/svg/model/SkSVGDOM.cpp",
536 "experimental/svg/model/SkSVGEllipse.cpp", 543 "experimental/svg/model/SkSVGEllipse.cpp",
537 "experimental/svg/model/SkSVGNode.cpp", 544 "experimental/svg/model/SkSVGNode.cpp",
538 "experimental/svg/model/SkSVGPath.cpp", 545 "experimental/svg/model/SkSVGPath.cpp",
539 "experimental/svg/model/SkSVGPoly.cpp", 546 "experimental/svg/model/SkSVGPoly.cpp",
540 "experimental/svg/model/SkSVGRect.cpp", 547 "experimental/svg/model/SkSVGRect.cpp",
541 "experimental/svg/model/SkSVGRenderContext.cpp", 548 "experimental/svg/model/SkSVGRenderContext.cpp",
542 "experimental/svg/model/SkSVGSVG.cpp", 549 "experimental/svg/model/SkSVGSVG.cpp",
543 "experimental/svg/model/SkSVGShape.cpp", 550 "experimental/svg/model/SkSVGShape.cpp",
544 "experimental/svg/model/SkSVGTransformableNode.cpp", 551 "experimental/svg/model/SkSVGTransformableNode.cpp",
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 "tools/SkShaper_harfbuzz.cpp", 610 "tools/SkShaper_harfbuzz.cpp",
604 "tools/using_skia_and_harfbuzz.cpp", 611 "tools/using_skia_and_harfbuzz.cpp",
605 ] 612 ]
606 deps = [ 613 deps = [
607 ":skia", 614 ":skia",
608 "//third_party/harfbuzz", 615 "//third_party/harfbuzz",
609 ] 616 ]
610 testonly = true 617 testonly = true
611 } 618 }
612 } 619 }
OLDNEW
« 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