diff options
| author | Ed Heyl <edheyl@google.com> | 2014-05-21 19:23:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 19:23:29 +0000 |
| commit | 1c7c2a0dfa4c3f42243a2ef7bbdab43c60230d2f (patch) | |
| tree | fb931d69d43e6b8821f7d790d6726f38cbc37c0d | |
| parent | b1b7addf2ad96ecaca7b3c611dd403d9c70f575a (diff) | |
| parent | a5291466eaca727de04a10eea7d1666bd3ba5adf (diff) | |
| download | frameworks_base-1c7c2a0dfa4c3f42243a2ef7bbdab43c60230d2f.zip frameworks_base-1c7c2a0dfa4c3f42243a2ef7bbdab43c60230d2f.tar.gz frameworks_base-1c7c2a0dfa4c3f42243a2ef7bbdab43c60230d2f.tar.bz2 | |
Merge "Fix the build: Revert "Switching to the final PDF rendering library""
| -rw-r--r-- | core/jni/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 4b899dc..99bbe39 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -171,9 +171,9 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ $(TOP)/frameworks/av/include \ $(TOP)/system/media/camera/include \ - external/libpdfium/core/include/fpdfapi \ - external/libpdfium/core/include/fpdfdoc \ - external/libpdfium/fpdfsdk/include \ + external/pdfrenderer/core/include/fpdfapi \ + external/pdfrenderer/core/include/fpdfdoc \ + external/pdfrenderer/fpdfsdk/include \ external/skia/src/core \ external/skia/src/effects \ external/skia/src/images \ @@ -227,7 +227,7 @@ LOCAL_SHARED_LIBRARIES := \ libharfbuzz_ng \ libz \ libaudioutils \ - libpdfium \ + libpdfrenderer \ libimg_utils \ ifeq ($(USE_OPENGL_RENDERER),true) |