Use make instead of cmake

DerGoogler · Oct 27, 2023 · 689cf7d · 689cf7d
1 parent e9d65f3
commit 689cf7d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 29 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -23,6 +23,9 @@ android {
                 arguments "-DANDROID_STL=c++_shared"
             }
         }
+
+        project.tasks.preBuild.dependsOn("webProd")
+
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
@@ -43,7 +46,7 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             multiDexEnabled true
-            project.tasks.preBuild.dependsOn("webProd")
+            // project.tasks.preBuild.dependsOn("webProd")
         }
         debug {
             resValue "string", "app_name", "${app_name} Debug"
@@ -52,12 +55,12 @@ android {
             minifyEnabled false
             multiDexEnabled false
             applicationIdSuffix '.debug'
-            project.tasks.preBuild.dependsOn("webDev")
+            // project.tasks.preBuild.dependsOn("webDev")
         }
     }
     externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
+        ndkBuild {
+            path("src/main/cpp/Android.mk")
         }
     }
     compileOptions {

diff --git a/Android/app/src/main/cpp/Android.mk b/Android/app/src/main/cpp/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libshell
+LOCAL_SRC_FILES := shell.cpp
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libproperties
+LOCAL_SRC_FILES := properties.cpp
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libclog
+LOCAL_SRC_FILES := clog.cpp
+LOCAL_LDLIBS := -llog
+include $(BUILD_SHARED_LIBRARY)
diff --git a/Android/app/src/main/cpp/CMakeLists.txt b/Android/app/src/main/cpp/CMakeLists.txt
diff --git a/Android/app/src/main/cpp/log.cpp → Android/app/src/main/cpp/clog.cpp b/Android/app/src/main/cpp/log.cpp → Android/app/src/main/cpp/clog.cpp
diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeLog.java b/Android/app/src/main/java/com/dergoogler/core/NativeLog.java
@@ -5,7 +5,7 @@
 public class NativeLog {
 
     static {
-        System.loadLibrary("native-log-lib");
+        System.loadLibrary("clog");
     }
 
     @JavascriptInterface

diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeProperties.java b/Android/app/src/main/java/com/dergoogler/core/NativeProperties.java
@@ -5,7 +5,7 @@
 public class NativeProperties {
 
     static {
-        System.loadLibrary("native-properties-lib");
+        System.loadLibrary("properties");
     }
 
     @JavascriptInterface

diff --git a/Android/app/src/main/java/com/dergoogler/core/NativeShell.java b/Android/app/src/main/java/com/dergoogler/core/NativeShell.java
@@ -19,7 +19,7 @@ public NativeShell(WebView wv) {
     }
 
     static {
-        System.loadLibrary("native-shell-lib");
+        System.loadLibrary("shell");
     }
 
     @JavascriptInterface