NDKBitmap: Turn on x86 support & update libndkbitmap.so

ctiao · Apr 7, 2015 · 77350c9 · 77350c9
1 parent c5b6cfa
commit 77350c9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/DanmakuFlameMaster/src/main/java/tv/cjump/jni/DeviceUtils.java b/DanmakuFlameMaster/src/main/java/tv/cjump/jni/DeviceUtils.java
@@ -144,4 +144,9 @@ public static boolean isRealARMArch() {
         return (supportABI("armeabi-v7a") || supportABI("armeabi")) && ARCH.ARM.equals(arch);
     }
 
+    public static boolean isRealX86Arch() {
+        ARCH arch = getMyCpuArch();
+        return supportABI(ABI_X86) || ARCH.X86.equals(arch);
+    }
+
 }
diff --git a/DanmakuFlameMaster/src/main/java/tv/cjump/jni/NativeBitmapFactory.java b/DanmakuFlameMaster/src/main/java/tv/cjump/jni/NativeBitmapFactory.java
@@ -22,7 +22,7 @@ public static boolean isInNativeAlloc() {
     }
 
     public static void loadLibs() {
-        if (!DeviceUtils.isRealARMArch()) {
+        if (!(DeviceUtils.isRealARMArch() || DeviceUtils.isRealX86Arch())) {
             nativeLibLoaded = false;
             return;
         }

diff --git a/DanmakuFlameMaster/src/main/libs/armeabi-v7a/libndkbitmap.so b/DanmakuFlameMaster/src/main/libs/armeabi-v7a/libndkbitmap.so
diff --git a/DanmakuFlameMaster/src/main/libs/armeabi/libndkbitmap.so b/DanmakuFlameMaster/src/main/libs/armeabi/libndkbitmap.so
diff --git a/DanmakuFlameMaster/src/main/libs/mips/libndkbitmap.so b/DanmakuFlameMaster/src/main/libs/mips/libndkbitmap.so
diff --git a/DanmakuFlameMaster/src/main/libs/x86/libndkbitmap.so b/DanmakuFlameMaster/src/main/libs/x86/libndkbitmap.so