branch cleanup

ro8inmorgan · ro8inmorgan · commit 19b6996c68da · 2025-10-05T11:27:47.000+02:00
diff --git a/configuration.c b/configuration.c
@@ -56,7 +56,9 @@
 
 #include "list_special.h"
 
-#include "pkg/android/phoenix-common/jni/ra_android_fpsbridge.h"
+#if defined(ANDROID
+#include "pkg/android/phoenix-common/jni/ra_android_bridge.h"
+#endif
 
 #if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
 #include "uwp/uwp_func.h"
diff --git a/pkg/android/phoenix-common/jni/Android.mk b/pkg/android/phoenix-common/jni/Android.mk
@@ -59,7 +59,7 @@ LOCAL_SRC_FILES  +=	$(RARCH_DIR)/griffin/griffin.c \
 							$(RARCH_DIR)/griffin/griffin_cpp.cpp
 
 LOCAL_SRC_FILES += \
-    ra_android_fpsbridge.c
+    ra_android_bridge.c
 
 LOCAL_C_INCLUDES += \
     $(RA_ROOT) \
diff --git a/pkg/android/phoenix-common/jni/ra_android_bridge.c b/pkg/android/phoenix-common/jni/ra_android_bridge.c
@@ -1,4 +1,4 @@
-// ra_android_fpsbridge.c
+// ra_android_bridge.c
 // If compiled as C++ file, wrap with extern "C"
 #include <jni.h>
 #include <libretro.h>
diff --git a/pkg/android/phoenix-common/jni/ra_android_bridge.h b/pkg/android/phoenix-common/jni/ra_android_bridge.h
@@ -1,5 +1,5 @@
-#ifndef RA_ANDROID_FPSBRIDGE_H
-#define RA_ANDROID_FPSBRIDGE_H
+#ifndef RA_ANDROID_BRIDGE_H
+#define RA_ANDROID_BRIDGE_H
 
 #ifdef __cplusplus
 extern "C" {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// ra_android_fpsbridge.c`
	`1`	`+// ra_android_bridge.c`
`2`	`2`	`// If compiled as C++ file, wrap with extern "C"`
`3`	`3`	`#include <jni.h>`
`4`	`4`	`#include <libretro.h>`