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

Side by Side Diff: BUILD.gn

Issue 1420503012: Partial revert of commit c6d8683 to fix a GN + Win/Clang build warning. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 5 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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("//testing/test.gni") 5 import("//testing/test.gni")
6 import("pdfium.gni") 6 import("pdfium.gni")
7 7
8 config("pdfium_config") { 8 config("pdfium_config") {
9 cflags = [] 9 cflags = []
10 include_dirs = [ "third_party/freetype/include" ] 10 include_dirs = [ "third_party/freetype/include" ]
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 "core/src/fxge/ge/fx_ge_fontmap.cpp", 547 "core/src/fxge/ge/fx_ge_fontmap.cpp",
548 "core/src/fxge/ge/fx_ge_linux.cpp", 548 "core/src/fxge/ge/fx_ge_linux.cpp",
549 "core/src/fxge/ge/fx_ge_path.cpp", 549 "core/src/fxge/ge/fx_ge_path.cpp",
550 "core/src/fxge/ge/fx_ge_ps.cpp", 550 "core/src/fxge/ge/fx_ge_ps.cpp",
551 "core/src/fxge/ge/fx_ge_text.cpp", 551 "core/src/fxge/ge/fx_ge_text.cpp",
552 "core/src/fxge/ge/text_int.h", 552 "core/src/fxge/ge/text_int.h",
553 ] 553 ]
554 554
555 configs -= [ "//build/config/compiler:chromium_code" ] 555 configs -= [ "//build/config/compiler:chromium_code" ]
556 configs += [ 556 configs += [
557 ":fxge_warnings",
558 ":pdfium_config", 557 ":pdfium_config",
559 "//build/config/compiler:no_chromium_code", 558 "//build/config/compiler:no_chromium_code",
559 # As of this writing, this needs to be last to suppress a -Wswitch warning.
560 # https://crbug.com/547906
Nico 2015/10/27 00:03:03 The usual comment is # Must be after no_chrom
561 ":fxge_warnings",
560 ] 562 ]
561 563
562 if (pdf_use_skia) { 564 if (pdf_use_skia) {
563 sources = [ 565 sources = [
564 "core/src/fxge/skia/fx_skia_blitter_new.cpp", 566 "core/src/fxge/skia/fx_skia_blitter_new.cpp",
565 "core/src/fxge/skia/fx_skia_device.cpp", 567 "core/src/fxge/skia/fx_skia_device.cpp",
566 ] 568 ]
567 include_dirs = [ 569 include_dirs = [
568 "//third_party/skia/include/config", 570 "//third_party/skia/include/config",
569 "//third_party/skia/include/core", 571 "//third_party/skia/include/core",
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 "//v8", 813 "//v8",
812 "//v8/include", 814 "//v8/include",
813 ] 815 ]
814 } 816 }
815 configs -= [ "//build/config/compiler:chromium_code" ] 817 configs -= [ "//build/config/compiler:chromium_code" ]
816 configs += [ 818 configs += [
817 ":pdfium_config", 819 ":pdfium_config",
818 "//build/config/compiler:no_chromium_code", 820 "//build/config/compiler:no_chromium_code",
819 ] 821 ]
820 } 822 }
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