Always use the FreeType headers included in PDFium.
The problem with trying to use the system headers sometimes is that we'll need to use pkg-config which is pretty slow.
BUG=453844
TBR=brettw
Review URL: https://codereview.chromium.org/865333003
diff --git a/BUILD.gn b/BUILD.gn
index 9c58b03..b52913b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -14,6 +14,7 @@
config("pdfium_config") {
cflags = []
+ include_dirs = [ "third_party/freetype/include" ]
defines = [
"_FPDFSDK_LIB",
"_NO_GDIPLUS_", # workaround text rendering issues on Windows
@@ -44,10 +45,7 @@
}
if (bundle_freetype) {
- include_dirs = [ "third_party/freetype/include" ]
defines += [ "FT2_BUILD_LIBRARY" ]
- } else {
- include_dirs = [ "/usr/include/freetype2" ]
}
}
diff --git a/pdfium.gyp b/pdfium.gyp
index 8b13321..2b21e9d 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -16,21 +16,17 @@
'_NO_GDIPLUS_', # workaround text rendering issues on Windows
'OPJ_STATIC',
],
+ 'include_dirs': [
+ 'third_party/freetype/include',
+ ],
'conditions': [
['pdf_use_skia==1', {
'defines': ['_SKIA_SUPPORT_'],
}],
['bundle_freetype==1', {
- 'include_dirs': [
- 'third_party/freetype/include',
- ],
'defines' : [
'FT2_BUILD_LIBRARY',
],
- }, {
- 'include_dirs' : [
- '/usr/include/freetype2',
- ],
}],
['OS=="linux"', {
'conditions': [
