diff options
author | jbudorick <jbudorick@chromium.org> | 2016-06-10 06:28:40 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-10 06:28:40 -0700 |
commit | 7f3a15f714c8311b1adb7bdce1ac83c7113af598 (patch) | |
tree | 674f11667de8e12b7bdfaf445b2cc99810a306fd /core/fxge/android/fpf_skiafontmgr.h | |
parent | 855665d4889853f8ac71519de8ff004dba8eb056 (diff) | |
download | pdfium-7f3a15f714c8311b1adb7bdce1ac83c7113af598.tar.xz |
[Android] Add support for standalone PDFium gn build on Android.
This pulls in the android NDK and catapult, rolls chromium/src/build/,
and pulls in two .gni updates. It also fixes a few miscellaneous compile
failures in android-specific code.
BUG=pdfium:38
Review-Url: https://codereview.chromium.org/2059553002
Diffstat (limited to 'core/fxge/android/fpf_skiafontmgr.h')
-rw-r--r-- | core/fxge/android/fpf_skiafontmgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/fxge/android/fpf_skiafontmgr.h b/core/fxge/android/fpf_skiafontmgr.h index ec27a7fb21..6e8ebb6e64 100644 --- a/core/fxge/android/fpf_skiafontmgr.h +++ b/core/fxge/android/fpf_skiafontmgr.h @@ -111,8 +111,8 @@ class CFPF_SkiaFontMgr { int32_t iFaceIndex = 0); protected: - void ScanPath(const CFX_ByteStringC& path); - void ScanFile(const CFX_ByteStringC& file); + void ScanPath(const CFX_ByteString& path); + void ScanFile(const CFX_ByteString& file); void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc); void OutputSystemFonts(); |