diff --git a/.gitignore b/.gitignore index 995eb561..5a3ba8c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -src/main/libs src/main/obj *.iml diff --git a/build.gradle b/build.gradle index 49863608..7dae8eb8 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,7 @@ android { compileSdkVersion 26 defaultConfig { - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion 26 versionCode 1 versionName "1.9.0" @@ -68,7 +68,6 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:support-v4:26.1.0' } apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' diff --git a/src/main/java/com/shockwave/pdfium/PdfDocument.java b/src/main/java/com/shockwave/pdfium/PdfDocument.java index b5306a67..dfb865ee 100644 --- a/src/main/java/com/shockwave/pdfium/PdfDocument.java +++ b/src/main/java/com/shockwave/pdfium/PdfDocument.java @@ -2,7 +2,7 @@ import android.graphics.RectF; import android.os.ParcelFileDescriptor; -import android.support.v4.util.ArrayMap; +import android.util.ArrayMap; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/shockwave/pdfium/PdfiumCore.java b/src/main/java/com/shockwave/pdfium/PdfiumCore.java index 0b2421e6..e22ef545 100644 --- a/src/main/java/com/shockwave/pdfium/PdfiumCore.java +++ b/src/main/java/com/shockwave/pdfium/PdfiumCore.java @@ -119,7 +119,7 @@ public static int getNumFd(ParcelFileDescriptor fdObj) { /** Context needed to get screen density */ public PdfiumCore(Context ctx) { mCurrentDpi = ctx.getResources().getDisplayMetrics().densityDpi; - Log.d(TAG, "Starting PdfiumAndroid " + BuildConfig.VERSION_NAME); + Log.d(TAG, "Starting PdfiumAndroid" ); } /** Create new document from file */ diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk index df5c5088..d905195d 100644 --- a/src/main/jni/Application.mk +++ b/src/main/jni/Application.mk @@ -6,7 +6,5 @@ APP_PLATFORM = android-14 APP_ABI := armeabi-v7a \ arm64-v8a \ - mips \ - mips64 \ x86 \ x86_64 \ No newline at end of file diff --git a/src/main/jni/lib/mips/libc++_shared.so b/src/main/jni/lib/mips/libc++_shared.so deleted file mode 100755 index 533554ca..00000000 Binary files a/src/main/jni/lib/mips/libc++_shared.so and /dev/null differ diff --git a/src/main/jni/lib/mips/libmodft2.so b/src/main/jni/lib/mips/libmodft2.so deleted file mode 100755 index 2aeb607d..00000000 Binary files a/src/main/jni/lib/mips/libmodft2.so and /dev/null differ diff --git a/src/main/jni/lib/mips/libmodpng.so b/src/main/jni/lib/mips/libmodpng.so deleted file mode 100755 index bcb4bb73..00000000 Binary files a/src/main/jni/lib/mips/libmodpng.so and /dev/null differ diff --git a/src/main/jni/lib/mips64/libc++_shared.so b/src/main/jni/lib/mips64/libc++_shared.so deleted file mode 100755 index 3844c40a..00000000 Binary files a/src/main/jni/lib/mips64/libc++_shared.so and /dev/null differ diff --git a/src/main/jni/lib/mips64/libmodft2.so b/src/main/jni/lib/mips64/libmodft2.so deleted file mode 100755 index 1e179a4d..00000000 Binary files a/src/main/jni/lib/mips64/libmodft2.so and /dev/null differ diff --git a/src/main/jni/lib/mips64/libmodpng.so b/src/main/jni/lib/mips64/libmodpng.so deleted file mode 100755 index aa45e700..00000000 Binary files a/src/main/jni/lib/mips64/libmodpng.so and /dev/null differ diff --git a/src/main/jni/src/mainJNILib.cpp b/src/main/jni/src/mainJNILib.cpp index a888e69f..e12a383c 100644 --- a/src/main/jni/src/mainJNILib.cpp +++ b/src/main/jni/src/mainJNILib.cpp @@ -23,7 +23,7 @@ static Mutex sLibraryLock; static int sLibraryReferenceCount = 0; -static void initLibraryIfNeed(){ +static void initLibrary_IfNeed(){ Mutex::Autolock lock(sLibraryLock); if(sLibraryReferenceCount == 0){ LOGD("Init FPDF library"); @@ -55,7 +55,7 @@ class DocumentFile { FPDF_DOCUMENT pdfDocument = NULL; size_t fileSize; - DocumentFile() { initLibraryIfNeed(); } + DocumentFile() { initLibrary_IfNeed(); } ~DocumentFile(); }; DocumentFile::~DocumentFile(){ diff --git a/src/main/libs/arm64-v8a/libc++_shared.so b/src/main/libs/arm64-v8a/libc++_shared.so new file mode 100755 index 00000000..bb308af5 Binary files /dev/null and b/src/main/libs/arm64-v8a/libc++_shared.so differ diff --git a/src/main/libs/arm64-v8a/libjniPdfium.so b/src/main/libs/arm64-v8a/libjniPdfium.so new file mode 100755 index 00000000..56f4e10b Binary files /dev/null and b/src/main/libs/arm64-v8a/libjniPdfium.so differ diff --git a/src/main/libs/arm64-v8a/libmodft2.so b/src/main/libs/arm64-v8a/libmodft2.so new file mode 100755 index 00000000..69afaa3b Binary files /dev/null and b/src/main/libs/arm64-v8a/libmodft2.so differ diff --git a/src/main/libs/arm64-v8a/libmodpdfium.so b/src/main/libs/arm64-v8a/libmodpdfium.so new file mode 100755 index 00000000..8be36a21 Binary files /dev/null and b/src/main/libs/arm64-v8a/libmodpdfium.so differ diff --git a/src/main/libs/arm64-v8a/libmodpng.so b/src/main/libs/arm64-v8a/libmodpng.so new file mode 100755 index 00000000..97e00415 Binary files /dev/null and b/src/main/libs/arm64-v8a/libmodpng.so differ diff --git a/src/main/libs/armeabi-v7a/libc++_shared.so b/src/main/libs/armeabi-v7a/libc++_shared.so new file mode 100755 index 00000000..e389e899 Binary files /dev/null and b/src/main/libs/armeabi-v7a/libc++_shared.so differ diff --git a/src/main/libs/armeabi-v7a/libjniPdfium.so b/src/main/libs/armeabi-v7a/libjniPdfium.so new file mode 100755 index 00000000..fe3f0139 Binary files /dev/null and b/src/main/libs/armeabi-v7a/libjniPdfium.so differ diff --git a/src/main/libs/armeabi-v7a/libmodft2.so b/src/main/libs/armeabi-v7a/libmodft2.so new file mode 100755 index 00000000..2514bc8a Binary files /dev/null and b/src/main/libs/armeabi-v7a/libmodft2.so differ diff --git a/src/main/libs/armeabi-v7a/libmodpdfium.so b/src/main/libs/armeabi-v7a/libmodpdfium.so new file mode 100755 index 00000000..be29f09c Binary files /dev/null and b/src/main/libs/armeabi-v7a/libmodpdfium.so differ diff --git a/src/main/libs/armeabi-v7a/libmodpng.so b/src/main/libs/armeabi-v7a/libmodpng.so new file mode 100755 index 00000000..e4e43cac Binary files /dev/null and b/src/main/libs/armeabi-v7a/libmodpng.so differ diff --git a/src/main/libs/x86/libc++_shared.so b/src/main/libs/x86/libc++_shared.so new file mode 100755 index 00000000..348e7ebc Binary files /dev/null and b/src/main/libs/x86/libc++_shared.so differ diff --git a/src/main/libs/x86/libjniPdfium.so b/src/main/libs/x86/libjniPdfium.so new file mode 100755 index 00000000..d917d007 Binary files /dev/null and b/src/main/libs/x86/libjniPdfium.so differ diff --git a/src/main/libs/x86/libmodft2.so b/src/main/libs/x86/libmodft2.so new file mode 100755 index 00000000..c5412741 Binary files /dev/null and b/src/main/libs/x86/libmodft2.so differ diff --git a/src/main/jni/lib/mips64/libmodpdfium.so b/src/main/libs/x86/libmodpdfium.so similarity index 51% rename from src/main/jni/lib/mips64/libmodpdfium.so rename to src/main/libs/x86/libmodpdfium.so index fd261ca6..87a5d179 100755 Binary files a/src/main/jni/lib/mips64/libmodpdfium.so and b/src/main/libs/x86/libmodpdfium.so differ diff --git a/src/main/libs/x86/libmodpng.so b/src/main/libs/x86/libmodpng.so new file mode 100755 index 00000000..553f249e Binary files /dev/null and b/src/main/libs/x86/libmodpng.so differ diff --git a/src/main/libs/x86_64/libc++_shared.so b/src/main/libs/x86_64/libc++_shared.so new file mode 100755 index 00000000..096b719d Binary files /dev/null and b/src/main/libs/x86_64/libc++_shared.so differ diff --git a/src/main/libs/x86_64/libjniPdfium.so b/src/main/libs/x86_64/libjniPdfium.so new file mode 100755 index 00000000..47e4e7cd Binary files /dev/null and b/src/main/libs/x86_64/libjniPdfium.so differ diff --git a/src/main/libs/x86_64/libmodft2.so b/src/main/libs/x86_64/libmodft2.so new file mode 100755 index 00000000..711e0ec8 Binary files /dev/null and b/src/main/libs/x86_64/libmodft2.so differ diff --git a/src/main/jni/lib/mips/libmodpdfium.so b/src/main/libs/x86_64/libmodpdfium.so similarity index 54% rename from src/main/jni/lib/mips/libmodpdfium.so rename to src/main/libs/x86_64/libmodpdfium.so index 94a7100a..c5afb911 100755 Binary files a/src/main/jni/lib/mips/libmodpdfium.so and b/src/main/libs/x86_64/libmodpdfium.so differ diff --git a/src/main/libs/x86_64/libmodpng.so b/src/main/libs/x86_64/libmodpng.so new file mode 100755 index 00000000..a4fd46f2 Binary files /dev/null and b/src/main/libs/x86_64/libmodpng.so differ