naett.c

commit b78d821fe98201e70726f8b9589722b0169c93ac
parent cad8664cf236cdcf3df09c044ed0bf9e83d52555
Author: Erik Agsjö <erik.agsjo@gmail.com>
Date:   Thu, 20 Jul 2023 15:23:10 +0200

Remove JNI_OnLoad

Diffstat:
M
naett.c
 | 
6
------
M
src/naett_android.c
 | 
6
------
M
testrig/android/app/src/main/cpp/CMakeLists.txt
 | 
2
+-

3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/naett.c b/naett.c
@@ -1322,12 +1322,6 @@ void naettPlatformCloseResponse(InternalResponse* res) {
 
 static JavaVM* globalVM = NULL;
 
-JNIEXPORT
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-    globalVM = vm;
-    return JNI_VERSION_1_2;
-}
-
 static JavaVM* getVM() {
     if (globalVM == NULL) {
         LOGE("Panic: No VM configured, exiting.");
diff --git a/src/naett_android.c b/src/naett_android.c
@@ -23,12 +23,6 @@
 
 static JavaVM* globalVM = NULL;
 
-JNIEXPORT
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-    globalVM = vm;
-    return JNI_VERSION_1_2;
-}
-
 static JavaVM* getVM() {
     if (globalVM == NULL) {
         LOGE("Panic: No VM configured, exiting.");
diff --git a/testrig/android/app/src/main/cpp/CMakeLists.txt b/testrig/android/app/src/main/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.4.1)
 
-set(${CMAKE_C_FLAGS}, "${CMAKE_C_FLAGS}")
+set(${CMAKE_C_FLAGS}, "${CMAKE_C_FLAGS} -Wall -Werror")
 add_library(naett STATIC ../../../../../../naett.c ../../../../../test.c)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall -Werror")