Revert "Use make instead of cmake"

This reverts commit 689cf7d.
DerGoogler · Oct 27, 2023 · c3aa614 · c3aa614
1 parent cd915b2
commit c3aa614
Show file tree

Hide file tree

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

diff --git a/Android/app/src/main/cpp/Android.mk b/Android/app/src/main/cpp/Android.mk
diff --git a/Android/app/src/main/cpp/CMakeLists.txt b/Android/app/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Sets the minimum version of CMake required to build your native library.
+# This ensures that a certain set of CMake features is available to
+# your build.
+
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Specifies a library name, specifies whether the library is STATIC or
+# SHARED, and provides relative paths to the source code. You can
+# define multiple libraries by adding multiple add_library() commands,
+# and CMake builds them for you. When you build your app, Gradle
+# automatically packages shared libraries with your APK.
+
+
+add_library(native-log-lib SHARED
+            log.cpp)
+
+add_library(native-properties-lib SHARED
+        properties.cpp)
+
+add_library(native-shell-lib SHARED
+        shell.cpp)
diff --git a/Android/app/src/main/cpp/clog.cpp → Android/app/src/main/cpp/log.cpp b/Android/app/src/main/cpp/clog.cpp → Android/app/src/main/cpp/log.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("clog");
+        System.loadLibrary("native-log-lib");
     }
 
     @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("properties");
+        System.loadLibrary("native-properties-lib");
     }
 
     @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("shell");
+        System.loadLibrary("native-shell-lib");
     }
 
     @JavascriptInterface