diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index 15cb1952f2..1a51812ccc 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -3,12 +3,11 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -APP_OPTIM := debug - LOCAL_MODULE := retroarch-activity RARCH_PATH := ../../.. LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \ + $(RARCH_PATH)/benchmark.c \ $(RARCH_PATH)/file.c \ $(RARCH_PATH)/file_path.c \ $(RARCH_PATH)/hash.c \ @@ -45,7 +44,7 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \ $(RARCH_PATH)/thread.c \ main.c -LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 +LOCAL_CFLAGS = -marm -DPERF_TEST -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz LOCAL_STATIC_LIBRARIES := android_native_app_glue diff --git a/benchmark.c b/benchmark.c index 8f4690a6ef..f6a21da97d 100644 --- a/benchmark.c +++ b/benchmark.c @@ -40,7 +40,7 @@ rarch_perf_tick_t rarch_get_perf_counter(void) #elif defined(__linux__) struct timespec tv; - if (clock_gettime(CLOCK_MONOTONIC_RAW, &tv) == 0) + if (clock_gettime(CLOCK_MONOTONIC, &tv) == 0) time = (rarch_perf_tick_t)tv.tv_sec * 1000000000 + (rarch_perf_tick_t)tv.tv_nsec; else time = 0;