diff --git a/android-example/app/.gitignore b/android-example/app/.gitignore index 796b96d..4e4023c 100644 --- a/android-example/app/.gitignore +++ b/android-example/app/.gitignore @@ -1 +1,2 @@ /build +/debug diff --git a/android-example/app/release/app-release.apk b/android-example/app/release/app-release.apk deleted file mode 100644 index bef4366..0000000 Binary files a/android-example/app/release/app-release.apk and /dev/null differ diff --git a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so index 871c43b..2a94be2 100644 Binary files a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so and b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so index fa13d9a..91fc237 100644 Binary files a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so and b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86/libirdecode.so b/android-example/app/src/main/jniLibs/x86/libirdecode.so index 985fbe3..eb40f5b 100644 Binary files a/android-example/app/src/main/jniLibs/x86/libirdecode.so and b/android-example/app/src/main/jniLibs/x86/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so index 9eb2e77..0ca5722 100644 Binary files a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so and b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so differ diff --git a/android-example/build.gradle b/android-example/build.gradle index 224543e..fe8bde7 100644 --- a/android-example/build.gradle +++ b/android-example/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/android-example/decodesdk/build.gradle b/android-example/decodesdk/build.gradle index e2dac5b..74f5e24 100644 --- a/android-example/decodesdk/build.gradle +++ b/android-example/decodesdk/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion 27 - buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 19 diff --git a/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java b/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java index 550a3e0..c09a2db 100644 --- a/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java +++ b/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java @@ -18,6 +18,10 @@ public class IRDecode { private static final String TAG = IRDecode.class.getSimpleName(); + static { + System.loadLibrary("irdecode"); + } + private static Object mSync = new Object(); private native int irOpen(int category, int subCate, String fileName); @@ -47,12 +51,6 @@ public class IRDecode { return mInstance; } - private IRDecode() { - String libPath = "/data/irext/libirda_decoder.so"; - System.out.println("loading decode library " + libPath); - System.load(libPath); - } - public int openFile(int category, int subCate, String fileName) { return irOpen(category, subCate, fileName); } diff --git a/android-example/web-api/build.gradle b/android-example/web-api/build.gradle index 9caaea3..665cd78 100644 --- a/android-example/web-api/build.gradle +++ b/android-example/web-api/build.gradle @@ -4,7 +4,6 @@ android { signingConfigs { } compileSdkVersion 27 - buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 19 targetSdkVersion 27