do not cache lightgun input

Makefile

@@ -708,6 +708,14 @@ else
 	CFLAGS += -D__WIN32__
 endif
 
+
+# All Android platforms       #############################
+ifneq ($(findstring Android, $(platform)), )
+	PLATCFLAGS += -D__ANDROID__
+else ifneq ($(findstring android, $(platform)), )
+	PLATCFLAGS += -D__ANDROID__
+endif
+
 # Architecture-specific flags #############################
 
 ifeq ($(BIGENDIAN), 1)
@@ -716,9 +724,10 @@ endif
 
 # End of architecture-specific flags ######################
 
-# Compiler flags for all platforms #############################
+# Compiler flags for all platforms ########################
 
-# explictly use -fsigned-char on all platforms to solve problems with code written/tested on x86 but used on ARM
+# explictly use -fsigned-char on all platforms to solve problems
+# with code written/tested on x86 but used on ARM
 # for example, audio on rtype leo is wrong on ARM without this flag
 ifeq (,$(findstring msvc,$(platform)))
 	CFLAGS += -fsigned-char

src/inptport.c

@@ -1491,10 +1491,12 @@ profiler_mark(PROFILER_INPUT);
 		osd_analogjoy_read (i, analog_current_axis[i], analogjoy_input[i]);
 
 		/* update mouse/trackball position */
-		osd_trak_read (i, &(mouse_delta_axis[i])[X_AXIS], &(mouse_delta_axis[i])[Y_AXIS]);
+		if(options.mouse_device == RETRO_DEVICE_MOUSE || options.mouse_device == RETRO_DEVICE_POINTER)
+			osd_xy_device_read (i, &(mouse_delta_axis[i])[X_AXIS], &(mouse_delta_axis[i])[Y_AXIS]);
 
 		/* update lightgun position, if any */
- 		osd_lightgun_read (i, &(lightgun_delta_axis[i])[X_AXIS], &(lightgun_delta_axis[i])[Y_AXIS]);
+		else if(options.mouse_device == RETRO_DEVICE_LIGHTGUN)
+ 			osd_xy_device_read (i, &(lightgun_delta_axis[i])[X_AXIS], &(lightgun_delta_axis[i])[Y_AXIS]);
 	}
 
 	for (i = 0;i < MAX_INPUT_PORTS;i++)