aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2016-12-07 20:43:03 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-08 15:22:37 +0000
commitee6c368a6d3429ff61c6a90561e0edc46945f0c3 (patch)
treedaf831c062939b72c45bffcdb1f7c5ab1ac39689 /third_party
parentb4a24e57c05d530e7329016bf0ca610f20d8c367 (diff)
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 <djsollen@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/freetype/include/freetype-android/ftoption.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/third_party/freetype/include/freetype-android/ftoption.h b/third_party/freetype/include/freetype-android/ftoption.h
index 6358771866..42aa623778 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 */