From ee6c368a6d3429ff61c6a90561e0edc46945f0c3 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 7 Dec 2016 20:43:03 +0000 Subject: [PATCH] Roll third_party/externals/freetype 4d3f7ca8cedb..ffd8f622360 https://skia.googlesource.com/third_party/freetype2.git/+log/4d3f7ca8cedb..ffd8f622360 Change-Id: Ia9d8af09253d0aff343c2310f5eb8c934b2ebbda Reviewed-on: https://skia-review.googlesource.com/5685 Reviewed-by: Derek Sollenberger Commit-Queue: Ben Wagner --- DEPS | 2 +- third_party/freetype/include/freetype-android/ftoption.h | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 9c8a36e..5916f8d 100644 --- a/DEPS +++ b/DEPS @@ -11,7 +11,7 @@ deps = { # - can use use our existing t_p/e/libjpeg instead of pulling it for Android? "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@d445357315299e30c18c756f657ff928653128c2", - "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@4d3f7ca8cedbddad40b9e93a82926618e3fb4265", + "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@ffd8f6223607e9d61de33467fcd113f2a15dae36", "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", diff --git a/third_party/freetype/include/freetype-android/ftoption.h b/third_party/freetype/include/freetype-android/ftoption.h index 6358771..42aa623 100644 --- a/third_party/freetype/include/freetype-android/ftoption.h +++ b/third_party/freetype/include/freetype-android/ftoption.h @@ -522,7 +522,21 @@ FT_BEGIN_HEADER /* code will be used. */ /* */ /* Setting this macro is needed for systems that prohibit address */ - /* fixups, such as BREW. */ + /* fixups, such as BREW. [Note that standard compilers like gcc or */ + /* clang handle PIC generation automatically; you don't have to set */ + /* FT_CONFIG_OPTION_PIC, which is only necessary for very special */ + /* compilers.] */ + /* */ + /* Note that FT_CONFIG_OPTION_PIC support is not available for all */ + /* modules (see `modules.cfg' for a complete list). For building with */ + /* FT_CONFIG_OPTION_PIC support, do the following. */ + /* */ + /* 0. Clone the repository. */ + /* 1. Define FT_CONFIG_OPTION_PIC. */ + /* 2. Remove all subdirectories in `src' that don't have */ + /* FT_CONFIG_OPTION_PIC support. */ + /* 3. Comment out the corresponding modules in `modules.cfg'. */ + /* 4. Compile. */ /* */ /* #define FT_CONFIG_OPTION_PIC */ -- 2.7.4