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

Side by Side Diff: BUILD.gn

Issue 2247413003: GN: make current_cpu work (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update BUILD.gn 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 | gn/BUILDCONFIG.gn » ('j') | 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_ssse3") { 147 is_x86 = current_cpu == "x64" || current_cpu == "x86"
148 configs += skia_library_configs
149 148
150 sources = opts_gypi.ssse3_sources 149 if (is_x86) {
151 cflags = [ "-mssse3" ] 150 source_set("opts_sse2") {
152 } 151 configs += skia_library_configs
152 sources = opts_gypi.sse2_sources
153 cflags = [ "-msse2" ]
154 }
153 155
154 source_set("opts_sse41") { 156 source_set("opts_ssse3") {
155 configs += skia_library_configs 157 configs += skia_library_configs
158 sources = opts_gypi.ssse3_sources
159 cflags = [ "-mssse3" ]
160 }
156 161
157 sources = opts_gypi.sse41_sources 162 source_set("opts_sse41") {
158 cflags = [ "-msse4.1" ] 163 configs += skia_library_configs
159 } 164 sources = opts_gypi.sse41_sources
165 cflags = [ "-msse4.1" ]
166 }
160 167
161 source_set("opts_sse42") { 168 source_set("opts_sse42") {
162 configs += skia_library_configs 169 configs += skia_library_configs
170 sources = opts_gypi.sse42_sources
171 cflags = [ "-msse4.2" ]
172 }
163 173
164 sources = opts_gypi.sse42_sources 174 source_set("opts_avx") {
165 cflags = [ "-msse4.2" ] 175 configs += skia_library_configs
166 } 176 sources = opts_gypi.avx_sources
167 177 cflags = [ "-mavx" ]
168 source_set("opts_avx") { 178 }
169 configs += skia_library_configs
170
171 sources = opts_gypi.avx_sources
172 cflags = [ "-mavx" ]
173 } 179 }
174 180
175 component("skia") { 181 component("skia") {
176 public_configs = [ ":skia_public" ] 182 public_configs = [ ":skia_public" ]
177 configs += skia_library_configs 183 configs += skia_library_configs
178 184
179 deps = [ 185 deps = [
180 ":opts_avx",
181 ":opts_sse41",
182 ":opts_sse42",
183 ":opts_ssse3",
184 "//third_party/expat", 186 "//third_party/expat",
185 "//third_party/giflib", 187 "//third_party/giflib",
186 "//third_party/libjpeg_turbo", 188 "//third_party/libjpeg_turbo",
187 "//third_party/libpng", 189 "//third_party/libpng",
188 "//third_party/libwebp", 190 "//third_party/libwebp",
189 "//third_party/sfntly", 191 "//third_party/sfntly",
190 "//third_party/zlib", 192 "//third_party/zlib",
191 ] 193 ]
194 if (is_x86) {
195 deps += [
196 ":opts_avx",
197 ":opts_sse2",
198 ":opts_sse41",
199 ":opts_sse42",
200 ":opts_ssse3",
201 ]
202 }
192 203
193 if (!is_win) { 204 if (!is_win) {
194 libs = [ "pthread" ] 205 libs = [ "pthread" ]
195 } 206 }
196 207
197 sources = [] 208 sources = []
198 sources += core_gypi.sources 209 sources += core_gypi.sources
199 sources += effects_gypi.sources 210 sources += effects_gypi.sources
200 sources += gpu_gypi.skgpu_sources 211 sources += gpu_gypi.skgpu_sources
201 sources += opts_gypi.sse2_sources
202 sources += pdf_gypi.sources 212 sources += pdf_gypi.sources
203 sources += utils_gypi.sources 213 sources += utils_gypi.sources
204 sources += [ 214 sources += [
205 "src/android/SkBitmapRegionCodec.cpp", 215 "src/android/SkBitmapRegionCodec.cpp",
206 "src/android/SkBitmapRegionDecoder.cpp", 216 "src/android/SkBitmapRegionDecoder.cpp",
207 "src/codec/SkAndroidCodec.cpp", 217 "src/codec/SkAndroidCodec.cpp",
208 "src/codec/SkBmpCodec.cpp", 218 "src/codec/SkBmpCodec.cpp",
209 "src/codec/SkBmpMaskCodec.cpp", 219 "src/codec/SkBmpMaskCodec.cpp",
210 "src/codec/SkBmpRLECodec.cpp", 220 "src/codec/SkBmpRLECodec.cpp",
211 "src/codec/SkBmpStandardCodec.cpp", 221 "src/codec/SkBmpStandardCodec.cpp",
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 "tools/SkShaper_harfbuzz.cpp", 601 "tools/SkShaper_harfbuzz.cpp",
592 "tools/using_skia_and_harfbuzz.cpp", 602 "tools/using_skia_and_harfbuzz.cpp",
593 ] 603 ]
594 deps = [ 604 deps = [
595 ":skia", 605 ":skia",
596 "//third_party/harfbuzz", 606 "//third_party/harfbuzz",
597 ] 607 ]
598 testonly = true 608 testonly = true
599 } 609 }
600 } 610 }
OLDNEW
« no previous file with comments | « no previous file | gn/BUILDCONFIG.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698