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

Side by Side Diff: skia/BUILD.gn

Issue 2075343002: Fix Skia GN build on Mac (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 6 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 | « core/fxge/apple/fx_apple_platform.cpp ('k') | 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 (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 8
9 if (current_cpu == "arm") { 9 if (current_cpu == "arm") {
10 import("//build/config/arm.gni") 10 import("//build/config/arm.gni")
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 ] 331 ]
332 } 332 }
333 if (!is_mac) { 333 if (!is_mac) {
334 sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] 334 sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
335 } 335 }
336 336
337 if (!is_linux && !is_android && !is_win) { 337 if (!is_linux && !is_android && !is_win) {
338 sources -= [ 338 sources -= [
339 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", 339 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
340 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", 340 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
341 "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
342 "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
dsinclair 2016/06/21 19:49:01 Cary, is this OK? I know you removed these from a
341 ] 343 ]
342 } 344 }
343 345
344 if (is_clang && !is_nacl) { 346 if (is_clang && !is_nacl) {
345 # Skia won't compile with some of the more strict clang warnings. 347 # Skia won't compile with some of the more strict clang warnings.
346 # e.g. it does: 348 # e.g. it does:
347 # SkASSERT(!"sk_out_of_memory"); 349 # SkASSERT(!"sk_out_of_memory");
348 configs -= [ "//build/config/clang:extra_warnings" ] 350 configs -= [ "//build/config/clang:extra_warnings" ]
349 } 351 }
350 352
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 544
543 configs -= [ "//build/config/compiler:chromium_code" ] 545 configs -= [ "//build/config/compiler:chromium_code" ]
544 configs += [ 546 configs += [
545 ":skia_config", 547 ":skia_config",
546 ":skia_library_config", 548 ":skia_library_config",
547 "//build/config/compiler:no_chromium_code", 549 "//build/config/compiler:no_chromium_code",
548 ] 550 ]
549 551
550 visibility = [ ":skia" ] 552 visibility = [ ":skia" ]
551 } 553 }
OLDNEW
« no previous file with comments | « core/fxge/apple/fx_apple_platform.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698