Fix Android compilation

1. Define GIT_VERSION preprocessor variable in jni/Android.mk

   error: use of undeclared identifier 'GIT_VERSION'

2. Add -llog linker dependency for Android logging functions

   error: undefined reference to '__android_log_print'

3. Prevent Clang error providing explicit "%s" format for snprintf

   error: format string is not a string literal
This commit is contained in:
Adam Strzelecki 2017-10-09 16:07:39 +02:00
parent 2445afd0f3
commit fe5dd91725
2 changed files with 3 additions and 3 deletions

View File

@ -23,8 +23,8 @@ CORE_DIR = ..
include $(CORE_DIR)/Makefile.common
LOCAL_SRC_FILES += $(SOURCES_C)
LOCAL_CFLAGS += -O2 -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DNDEBUG=1 $(INCFLAGS)
LOCAL_CFLAGS += -O2 -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DNDEBUG=1 -DGIT_VERSION=\"$(GIT_VERSION)\" $(INCFLAGS)
LOCAL_LDLIBS += -lz
LOCAL_LDLIBS += -lz -llog
include $(BUILD_SHARED_LIBRARY)

View File

@ -156,7 +156,7 @@ static void update_variables(void)
{
char *pch;
char str[100];
snprintf(str, sizeof(str), var.value);
snprintf(str, sizeof(str), "%s", var.value);
pch = strtok(str, "x");
if (pch)