Merge "Switching to the final PDF rendering library"
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 99bbe39..355204e 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -171,9 +171,9 @@
$(call include-path-for, libhardware_legacy)/hardware_legacy \
$(TOP)/frameworks/av/include \
$(TOP)/system/media/camera/include \
- external/pdfrenderer/core/include/fpdfapi \
- external/pdfrenderer/core/include/fpdfdoc \
- external/pdfrenderer/fpdfsdk/include \
+ external/pdfium/core/include/fpdfapi \
+ external/pdfium/core/include/fpdfdoc \
+ external/pdfium/fpdfsdk/include \
external/skia/src/core \
external/skia/src/effects \
external/skia/src/images \
@@ -227,7 +227,7 @@
libharfbuzz_ng \
libz \
libaudioutils \
- libpdfrenderer \
+ libpdfium \
libimg_utils \
ifeq ($(USE_OPENGL_RENDERER),true)