Merge native

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "native/src/main/jni/libarchive"]
-	path = native/src/main/jni/libarchive
+[submodule "app/src/main/cpp/libarchive"]
+	path = app/src/main/cpp/libarchive
 	url = https://github.com/Ehviewer-Overhauled/libarchive
-[submodule "native/src/main/jni/liblzma"]
-	path = native/src/main/jni/liblzma
+[submodule "app/src/main/cpp/liblzma"]
+	path = app/src/main/cpp/liblzma
 	url = https://github.com/Ehviewer-Overhauled/xz
-[submodule "native/src/main/jni/nettle/nettle"]
-	path = native/src/main/jni/nettle/nettle
+[submodule "app/src/main/cpp/nettle/nettle"]
+	path = app/src/main/cpp/nettle/nettle
 	url = https://github.com/Ehviewer-Overhauled/nettle

app/.gitignore

@@ -4,4 +4,5 @@ manifest-merger-release-report.txt
 /src/main/libs
 /src/main/obj
 # Intellij
-*.iml
+*.iml
+/.cxx

app/build.gradle

@@ -7,6 +7,7 @@ plugins {
 android {
     compileSdkVersion 33
     buildToolsVersion "33.0.0"
+    ndkVersion "25.0.8775105"
 
     Properties localProperties = new Properties()
     if (project.rootProject.file('local.properties').exists()) {
@@ -37,6 +38,22 @@ android {
         versionCode 180004
         versionName "1.8.0.4"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
+
+        externalNativeBuild {
+            cmake {
+                arguments '-DANDROID_STL=none'
+            }
+        }
+
+        ndk {
+            abiFilters 'arm64-v8a', 'x86_64', 'armeabi-v7a', 'x86'
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path 'src/main/cpp/CMakeLists.txt'
+        }
     }
 
     compileOptions {
@@ -164,7 +181,6 @@ dependencies {
     implementation 'dev.rikka.rikkax.material:material-preference:2.0.0'
     implementation 'org.greenrobot:greendao:3.3.0'
     implementation 'org.jsoup:jsoup:1.15.2'
-    implementation projects.native
 }
 
 configurations.all {

app/proguard-rules.pro

@@ -32,3 +32,6 @@
 -dontwarn org.conscrypt.Conscrypt
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+-keepclasseswithmembernames class * { native <methods>;}
+-keepclassmembers class com.hippo.image.Image {private <init>(long, int, int, int);}

native/.gitignore

@@ -1,8 +0,0 @@
-/build
-/src/main/java-gen
-manifest-merger-release-report.txt
-/src/main/libs
-/src/main/obj
-# Intellij
-*.iml
-/.cxx

native/build.gradle

@@ -1,41 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.0"
-    ndkVersion "25.0.8775105"
-
-    defaultConfig {
-        minSdkVersion 31
-        targetSdkVersion 33
-        consumerProguardFiles 'proguard-rules.pro'
-
-        externalNativeBuild {
-            cmake {
-                arguments '-DANDROID_STL=none'
-            }
-        }
-
-        ndk {
-            abiFilters 'arm64-v8a', 'x86_64', 'armeabi-v7a', 'x86'
-        }
-    }
-
-    externalNativeBuild {
-        cmake {
-            path 'src/main/jni/CMakeLists.txt'
-        }
-    }
-
-    buildFeatures {
-        buildConfig false
-    }
-    namespace 'com.hippo'
-}
-
-dependencies {
-    compileOnly 'androidx.annotation:annotation:1.4.0'
-}

native/proguard-rules.pro

@@ -1,2 +0,0 @@
--keepclasseswithmembernames class * { native <methods>;}
--keepclassmembers class com.hippo.image.Image {private <init>(long, int, int, int);}