From c3aa6141ee738eef533333e2f54c414e944ecee0 Mon Sep 17 00:00:00 2001
From: Der_Googler <54764558+DerGoogler@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:20:08 +0200
Subject: [PATCH] Revert "Use make instead of cmake"

This reverts commit 689cf7db94c5720211fdc9f294d106c4525c78ab.
---
 Android/app/build.gradle                      | 11 ++++------
 Android/app/src/main/cpp/Android.mk           | 17 --------------
 Android/app/src/main/cpp/CMakeLists.txt       | 22 +++++++++++++++++++
 .../app/src/main/cpp/{clog.cpp => log.cpp}    |  0
 .../java/com/dergoogler/core/NativeLog.java   |  2 +-
 .../com/dergoogler/core/NativeProperties.java |  2 +-
 .../java/com/dergoogler/core/NativeShell.java |  2 +-
 7 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 Android/app/src/main/cpp/Android.mk
 create mode 100644 Android/app/src/main/cpp/CMakeLists.txt
 rename Android/app/src/main/cpp/{clog.cpp => log.cpp} (100%)

diff --git a/Android/app/build.gradle b/Android/app/build.gradle
index c99974e9..357adb78 100755
--- 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
deleted file mode 100644
index 5eb87996..00000000
--- a/Android/app/src/main/cpp/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-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)
\ No newline at end of file
diff --git a/Android/app/src/main/cpp/CMakeLists.txt b/Android/app/src/main/cpp/CMakeLists.txt
new file mode 100644
index 00000000..1732d38c
--- /dev/null
+++ 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)
\ No newline at end of file
diff --git a/Android/app/src/main/cpp/clog.cpp b/Android/app/src/main/cpp/log.cpp
similarity index 100%
rename from Android/app/src/main/cpp/clog.cpp
rename to 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
index 52061289..f19eac00 100644
--- 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
index 7318db27..7e3d195b 100644
--- 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
index 35829a13..3b78b7b7 100644
--- 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