Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency of old support library #78

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
src/main/libs
src/main/obj

*.iml
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ android {
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
minSdkVersion 19
targetSdkVersion 26
versionCode 1
versionName "1.9.0"
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/shockwave/pdfium/PdfDocument.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/shockwave/pdfium/PdfiumCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 0 additions & 2 deletions src/main/jni/Application.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ APP_PLATFORM = android-14

APP_ABI := armeabi-v7a \
arm64-v8a \
mips \
mips64 \
x86 \
x86_64
Binary file removed src/main/jni/lib/mips/libc++_shared.so
Binary file not shown.
Binary file removed src/main/jni/lib/mips/libmodft2.so
Binary file not shown.
Binary file removed src/main/jni/lib/mips/libmodpng.so
Binary file not shown.
Binary file removed src/main/jni/lib/mips64/libc++_shared.so
Binary file not shown.
Binary file removed src/main/jni/lib/mips64/libmodft2.so
Binary file not shown.
Binary file removed src/main/jni/lib/mips64/libmodpng.so
Binary file not shown.
4 changes: 2 additions & 2 deletions src/main/jni/src/mainJNILib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -55,7 +55,7 @@ class DocumentFile {
FPDF_DOCUMENT pdfDocument = NULL;
size_t fileSize;

DocumentFile() { initLibraryIfNeed(); }
DocumentFile() { initLibrary_IfNeed(); }
~DocumentFile();
};
DocumentFile::~DocumentFile(){
Expand Down
Binary file added src/main/libs/arm64-v8a/libc++_shared.so
Binary file not shown.
Binary file added src/main/libs/arm64-v8a/libjniPdfium.so
Binary file not shown.
Binary file added src/main/libs/arm64-v8a/libmodft2.so
Binary file not shown.
Binary file added src/main/libs/arm64-v8a/libmodpdfium.so
Binary file not shown.
Binary file added src/main/libs/arm64-v8a/libmodpng.so
Binary file not shown.
Binary file added src/main/libs/armeabi-v7a/libc++_shared.so
Binary file not shown.
Binary file added src/main/libs/armeabi-v7a/libjniPdfium.so
Binary file not shown.
Binary file added src/main/libs/armeabi-v7a/libmodft2.so
Binary file not shown.
Binary file added src/main/libs/armeabi-v7a/libmodpdfium.so
Binary file not shown.
Binary file added src/main/libs/armeabi-v7a/libmodpng.so
Binary file not shown.
Binary file added src/main/libs/x86/libc++_shared.so
Binary file not shown.
Binary file added src/main/libs/x86/libjniPdfium.so
Binary file not shown.
Binary file added src/main/libs/x86/libmodft2.so
Binary file not shown.
Binary file not shown.
Binary file added src/main/libs/x86/libmodpng.so
Binary file not shown.
Binary file added src/main/libs/x86_64/libc++_shared.so
Binary file not shown.
Binary file added src/main/libs/x86_64/libjniPdfium.so
Binary file not shown.
Binary file added src/main/libs/x86_64/libmodft2.so
Binary file not shown.
Binary file not shown.
Binary file added src/main/libs/x86_64/libmodpng.so
Binary file not shown.