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

Side by Side Diff: skia/BUILD.gn

Issue 924063003: [Favicon] Adding FallbackIconUrlParser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync, to include the fix from https://codereview.chromium.org/971623003 . Created 5 years, 9 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 | « chrome/common/favicon/fallback_icon_url_parser_unittest.cc ('k') | skia/skia_library.gypi » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 if (current_cpu == "arm") { 8 if (current_cpu == "arm") {
9 import("//build/config/arm.gni") 9 import("//build/config/arm.gni")
10 } 10 }
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 248
249 cflags = [ 249 cflags = [
250 "/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)' 250 "/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
251 "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit). 251 "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit).
252 "/wd4341", # signed value is out of range for enum constant. 252 "/wd4341", # signed value is out of range for enum constant.
253 "/wd4345", # Object is default-initialized if initialization is omitted. 253 "/wd4345", # Object is default-initialized if initialization is omitted.
254 "/wd4390", # ';'empty statement found in looping;is it what was intended? 254 "/wd4390", # ';'empty statement found in looping;is it what was intended?
255 "/wd4554", # 'operator' : check operator precedence for possible error 255 "/wd4554", # 'operator' : check operator precedence for possible error
256 "/wd4748", # compiler will disable optimizations if a function has inline 256 "/wd4748", # compiler will disable optimizations if a function has inline
257 # assembly code contains flow control(jmp or jcc) statements. 257 # assembly code contains flow control(jmp or jcc) statements.
258
259 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). 258 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool).
260 ] 259 ]
261 } 260 }
262 } 261 }
263 262
264 component("skia") { 263 component("skia") {
265 sources = [ 264 sources = [
266 # Chrome sources. 265 # Chrome sources.
267 "config/SkUserConfig.h", 266 "config/SkUserConfig.h",
268 "ext/SkDiscardableMemory_chrome.cc", 267 "ext/SkDiscardableMemory_chrome.cc",
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 "//third_party/skia/include/utils/SkCubicInterval.h", 335 "//third_party/skia/include/utils/SkCubicInterval.h",
337 "//third_party/skia/include/utils/SkCullPoints.h", 336 "//third_party/skia/include/utils/SkCullPoints.h",
338 "//third_party/skia/include/utils/SkDebugUtils.h", 337 "//third_party/skia/include/utils/SkDebugUtils.h",
339 "//third_party/skia/include/utils/SkDumpCanvas.h", 338 "//third_party/skia/include/utils/SkDumpCanvas.h",
340 "//third_party/skia/include/utils/SkEventTracer.h", 339 "//third_party/skia/include/utils/SkEventTracer.h",
341 "//third_party/skia/include/utils/SkFrontBufferedStream.h", 340 "//third_party/skia/include/utils/SkFrontBufferedStream.h",
342 "//third_party/skia/include/utils/SkInterpolator.h", 341 "//third_party/skia/include/utils/SkInterpolator.h",
343 "//third_party/skia/include/utils/SkLayer.h", 342 "//third_party/skia/include/utils/SkLayer.h",
344 "//third_party/skia/include/utils/SkMeshUtils.h", 343 "//third_party/skia/include/utils/SkMeshUtils.h",
345 "//third_party/skia/include/utils/SkNinePatch.h", 344 "//third_party/skia/include/utils/SkNinePatch.h",
346 "//third_party/skia/include/utils/SkParse.h",
347 "//third_party/skia/include/utils/SkParsePaint.h", 345 "//third_party/skia/include/utils/SkParsePaint.h",
348 "//third_party/skia/include/utils/SkParsePath.h", 346 "//third_party/skia/include/utils/SkParsePath.h",
349 "//third_party/skia/include/utils/SkRandom.h", 347 "//third_party/skia/include/utils/SkRandom.h",
350 "//third_party/skia/src/utils/SkBitmapHasher.cpp", 348 "//third_party/skia/src/utils/SkBitmapHasher.cpp",
351 "//third_party/skia/src/utils/SkBitmapHasher.h", 349 "//third_party/skia/src/utils/SkBitmapHasher.h",
352 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", 350 "//third_party/skia/src/utils/SkBoundaryPatch.cpp",
353 "//third_party/skia/src/utils/SkCamera.cpp", 351 "//third_party/skia/src/utils/SkCamera.cpp",
354 "//third_party/skia/src/utils/SkCanvasStack.h", 352 "//third_party/skia/src/utils/SkCanvasStack.h",
355 "//third_party/skia/src/utils/SkCubicInterval.cpp", 353 "//third_party/skia/src/utils/SkCubicInterval.cpp",
356 "//third_party/skia/src/utils/SkCullPoints.cpp", 354 "//third_party/skia/src/utils/SkCullPoints.cpp",
357 "//third_party/skia/src/utils/SkDumpCanvas.cpp", 355 "//third_party/skia/src/utils/SkDumpCanvas.cpp",
358 "//third_party/skia/src/utils/SkFloatUtils.h", 356 "//third_party/skia/src/utils/SkFloatUtils.h",
359 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", 357 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
360 "//third_party/skia/src/utils/SkInterpolator.cpp", 358 "//third_party/skia/src/utils/SkInterpolator.cpp",
361 "//third_party/skia/src/utils/SkLayer.cpp", 359 "//third_party/skia/src/utils/SkLayer.cpp",
362 "//third_party/skia/src/utils/SkMD5.cpp", 360 "//third_party/skia/src/utils/SkMD5.cpp",
363 "//third_party/skia/src/utils/SkMD5.h", 361 "//third_party/skia/src/utils/SkMD5.h",
364 "//third_party/skia/src/utils/SkMeshUtils.cpp", 362 "//third_party/skia/src/utils/SkMeshUtils.cpp",
365 "//third_party/skia/src/utils/SkNinePatch.cpp", 363 "//third_party/skia/src/utils/SkNinePatch.cpp",
366 "//third_party/skia/src/utils/SkOSFile.cpp", 364 "//third_party/skia/src/utils/SkOSFile.cpp",
367 "//third_party/skia/src/utils/SkParse.cpp",
368 "//third_party/skia/src/utils/SkParseColor.cpp",
369 "//third_party/skia/src/utils/SkParsePath.cpp", 365 "//third_party/skia/src/utils/SkParsePath.cpp",
370 "//third_party/skia/src/utils/SkPathUtils.cpp", 366 "//third_party/skia/src/utils/SkPathUtils.cpp",
371 "//third_party/skia/src/utils/SkSHA1.cpp", 367 "//third_party/skia/src/utils/SkSHA1.cpp",
372 "//third_party/skia/src/utils/SkSHA1.h", 368 "//third_party/skia/src/utils/SkSHA1.h",
373 "//third_party/skia/src/utils/SkTFitsIn.h", 369 "//third_party/skia/src/utils/SkTFitsIn.h",
374 "//third_party/skia/src/utils/SkTLogic.h", 370 "//third_party/skia/src/utils/SkTLogic.h",
375 371
376 # We don't currently need to change thread affinity, so leave out this compl exity for now. 372 # We don't currently need to change thread affinity, so leave out this compl exity for now.
377 "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", 373 "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
378 "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", 374 "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 deps = [ 623 deps = [
628 ":skia", 624 ":skia",
629 "//base", 625 "//base",
630 "//base/test:run_all_unittests", 626 "//base/test:run_all_unittests",
631 "//cc:test_support", # TODO: Fix this test to not depend on cc. 627 "//cc:test_support", # TODO: Fix this test to not depend on cc.
632 "//testing/gtest", 628 "//testing/gtest",
633 "//ui/gfx", 629 "//ui/gfx",
634 "//ui/gfx/geometry", 630 "//ui/gfx/geometry",
635 ] 631 ]
636 } 632 }
OLDNEW
« no previous file with comments | « chrome/common/favicon/fallback_icon_url_parser_unittest.cc ('k') | skia/skia_library.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698