From 49489dc0e8c151b956b3a56f2f99509a1db479fc Mon Sep 17 00:00:00 2001
From: Bjorn <mail@bjornbyt.es>
Date: Sun, 5 Feb 2023 21:47:52 -0800
Subject: [PATCH] Apply suggestions from code review

---
 CMakeLists.txt        | 6 +++---
 src/core/os_android.c | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d59748c..acd80c17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -741,13 +741,13 @@ elseif(EMSCRIPTEN)
 elseif(ANDROID)
   set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/etc/AndroidManifest.xml" CACHE STRING "The AndroidManifest.xml file to use")
   file(READ ${ANDROID_MANIFEST} ANDROID_MANIFEST_CONTENT)
-  string(REGEX MATCH "package=\"([^\"]*)" ANDROID_PACKAGE ${ANDROID_MANIFEST_CONTENT})
-  string(SUBSTRING ${ANDROID_PACKAGE} 9 -1 ANDROID_PACKAGE) #I dunno how to do a lookbehind
+  string(REGEX MATCH "package=\"([^\"]*)" _ ${ANDROID_MANIFEST_CONTENT})
+  set(ANDROID_PACKAGE ${CMAKE_MATCH_1})
 
   string(REPLACE "." "_" ANDROID_PACKAGE_C ${ANDROID_PACKAGE})
   string(REPLACE "." "/" ANDROID_PACKAGE_JAVA ${ANDROID_PACKAGE})
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/etc/Activity.java ${CMAKE_CURRENT_BINARY_DIR}/Activity.java)
-  target_compile_definitions(lovr PRIVATE "LOVR_PKG=${ANDROID_PACKAGE_C}")
+  target_compile_definitions(lovr PRIVATE "LOVR_JAVA_PACKAGE=${ANDROID_PACKAGE_C}")
 
   target_sources(lovr PRIVATE src/core/os_android.c)
   target_link_libraries(lovr log android dl)
diff --git a/src/core/os_android.c b/src/core/os_android.c
index 88ac9147..ce6925c4 100644
--- a/src/core/os_android.c
+++ b/src/core/os_android.c
@@ -241,11 +241,10 @@ void os_sleep(double seconds) {
   while (nanosleep(&t, &t));
 }
 
-//This two-level macro do it's job
-#define _JNI(PKG, X) Java_ ## PKG ##_##X
-#define JNI(PKG, X) _JNI(PKG,X)
+#define _JNI(PKG, X) Java_ ## PKG ## _ ## X
+#define JNI(PKG, X) _JNI(PKG, X)
 
-JNIEXPORT void JNICALL JNI(LOVR_PKG, Activity_lovrPermissionEvent)(JNIEnv* jni, jobject activity, jint permission, jboolean granted) {
+JNIEXPORT void JNICALL JNI(LOVR_JAVA_PACKAGE, Activity_lovrPermissionEvent)(JNIEnv* jni, jobject activity, jint permission, jboolean granted) {
   if (state.onPermissionEvent) {
     state.onPermissionEvent(permission, granted);
   }