Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index 8b5092a1eb0b431f804928c073ceb0c8193a3a9b..a6af0b2c91d6f256697399957df74d6c5c34906d 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -7,7 +7,10 @@ import("pdfium.gni") |
| config("pdfium_config") { |
| cflags = [] |
| - include_dirs = [ "third_party/freetype/include" ] |
| + include_dirs = [ |
| + ".", |
| + "third_party/freetype/include", |
| + ] |
| defines = [ |
| "OPJ_STATIC", |
| "V8_DEPRECATION_WARNINGS", |
| @@ -39,6 +42,7 @@ config("pdfium_config") { |
| "/wd4333", |
| "/wd4345", |
| "/wd4267", |
| + |
| # TODO(thestig): Fix all instances, remove this, pdfium:29 |
| "/wd4245", |
| "/wd4310", |
| @@ -154,9 +158,7 @@ source_set("test_support") { |
| "//testing/gtest", |
| ":pdfium", |
| ] |
| - include_dirs = [ |
| - "." |
| - ] |
| + include_dirs = [] |
|
Tom Sepez
2015/11/05 22:09:26
This can be removed entirely?
Lei Zhang
2015/11/06 00:13:37
I think we need this for the include_dirs += [foo]
Tom Sepez
2015/11/06 00:17:19
Yes, you do, I remember getting burned by this bef
|
| if (pdf_enable_v8) { |
| deps += [ |
| "//v8", |
| @@ -351,9 +353,11 @@ static_library("fpdftext") { |
| static_library("fxcodec") { |
| deps = [ |
| "third_party:fx_lcms2", |
| - "third_party:fx_libjpeg", |
| "third_party:fx_libopenjpeg", |
| "third_party:fx_zlib", |
| + |
| + # This is a generic JPEG library dependency. |
| + "//third_party:jpeg", |
| ] |
| sources = [ |
| "core/include/fxcodec/fx_codec.h", |
| @@ -407,6 +411,7 @@ static_library("fxcodec") { |
| "core/src/fxcodec/jbig2/JBig2_TrdProc.cpp", |
| "core/src/fxcodec/jbig2/JBig2_TrdProc.h", |
| ] |
| + include_dirs = [] |
|
Tom Sepez
2015/11/05 22:09:26
ditto?
|
| if (is_posix) { |
| # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int |
| @@ -503,7 +508,6 @@ static_library("fxge") { |
| "core/src/fxge/dib/fx_dib_engine.cpp", |
| "core/src/fxge/dib/fx_dib_main.cpp", |
| "core/src/fxge/dib/fx_dib_transform.cpp", |
| - "core/src/fxge/fontdata/chromefontdata/chromefontdata.h", |
| "core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c", |
| "core/src/fxge/fontdata/chromefontdata/FoxitFixed.c", |
| "core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c", |
| @@ -520,6 +524,7 @@ static_library("fxge") { |
| "core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c", |
| "core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c", |
| "core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c", |
| + "core/src/fxge/fontdata/chromefontdata/chromefontdata.h", |
| "core/src/fxge/freetype/fx_freetype.c", |
| "core/src/fxge/ge/fx_ge.cpp", |
| "core/src/fxge/ge/fx_ge_device.cpp", |
| @@ -552,7 +557,9 @@ static_library("fxge") { |
| "//third_party/skia/include/utils", |
| "//third_party/skia/src/core", |
| ] |
| - deps = [ "//skia" ] |
| + deps = [ |
| + "//skia", |
| + ] |
| } |
| if (is_win) { |
| @@ -632,6 +639,7 @@ static_library("javascript") { |
| ] |
| if (pdf_enable_v8) { |
| sources += [ |
| + "fpdfsdk/include/jsapi/fxjs_v8.h", |
| "fpdfsdk/src/javascript/Consts.cpp", |
| "fpdfsdk/src/javascript/Consts.h", |
| "fpdfsdk/src/javascript/Document.cpp", |
| @@ -671,7 +679,6 @@ static_library("javascript") { |
| "fpdfsdk/src/javascript/resource.h", |
| "fpdfsdk/src/javascript/util.cpp", |
| "fpdfsdk/src/javascript/util.h", |
| - "fpdfsdk/include/jsapi/fxjs_v8.h", |
| "fpdfsdk/src/jsapi/fxjs_v8.cpp", |
| ] |
| include_dirs = [ |
| @@ -733,7 +740,6 @@ test("pdfium_unittests") { |
| ":pdfium", |
| ":test_support", |
| ] |
| - include_dirs = [ "." ] |
| configs += [ ":pdfium_config" ] |
| } |
| @@ -761,13 +767,9 @@ test("pdfium_embeddertests") { |
| ":pdfium", |
| ":test_support", |
| ] |
| - include_dirs = [ |
| - "." |
| - ] |
| + include_dirs = [] |
|
Tom Sepez
2015/11/05 22:09:26
ditto ditto
|
| if (pdf_enable_v8) { |
| - sources += [ |
| - "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp" |
| - ] |
| + sources += [ "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp" ] |
| deps += [ |
| "//v8", |
| "//v8:v8_libplatform", |