Commit b4e9988c authored by Ghislain MARY's avatar Ghislain MARY

Add arm64 support for Android.

parent 7bc1bbcc
......@@ -207,6 +207,9 @@ include_directories(
${MEDIASTREAMER2_INCLUDE_DIRS}
${BCTOOLBOX_CORE_INCLUDE_DIRS}
)
if(ANDROID)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/java)
endif()
if(ENABLE_TUNNEL)
include_directories(${TUNNEL_INCLUDE_DIRS})
endif()
......
......@@ -50,7 +50,7 @@ static char *utf8_convert(const char *filename){
wchar_t db_file_utf16[MAX_PATH_SIZE]={0};
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename, -1, db_file_utf16, MAX_PATH_SIZE);
WideCharToMultiByte(CP_UTF8, 0, db_file_utf16, -1, db_file_utf8, sizeof(db_file_utf8), NULL, NULL);
#elif defined(__QNXNTO__)
#elif defined(__QNXNTO__) || (defined(ANDROID) && defined(__LP64__))
strncpy(db_file_utf8, filename, MAX_PATH_SIZE - 1);
#else
char db_file_locale[MAX_PATH_SIZE] = {'\0'};
......
......@@ -259,7 +259,7 @@ static char* ConvertFromUtf8Filename(const char* fName){
}
bctbx_free(wideFilename);
return convertedFilename;
#elif defined(__QNXNTO__)
#elif defined(__QNXNTO__) || (defined(ANDROID) && defined(__LP64__))
return bctbx_strdup(fName);
#else
#define MAX_PATH_SIZE 1024
......
......@@ -58,6 +58,6 @@ if(ANDROID)
# HACK: accessing mediastreamer2 source directory from here is just wrong!
add_custom_target(linphonecore-jni-header
COMMAND ${Java_JAVAH_EXECUTABLE} -o "${CMAKE_BINARY_DIR}/linphonecore_jni.h" -classpath "${CMAKE_CURRENT_SOURCE_DIR}/impl:${CMAKE_CURRENT_SOURCE_DIR}/common:${CMAKE_CURRENT_SOURCE_DIR}/../mediastreamer2/java/src" ${JNI_CLASSES}
COMMAND ${Java_JAVAH_EXECUTABLE} -o "${CMAKE_CURRENT_BINARY_DIR}/linphonecore_jni.h" -classpath "${CMAKE_CURRENT_SOURCE_DIR}/impl:${CMAKE_CURRENT_SOURCE_DIR}/common:${CMAKE_CURRENT_SOURCE_DIR}/../mediastreamer2/java/src" ${JNI_CLASSES}
)
endif()
......@@ -30,7 +30,7 @@
/*getline is POSIX 2008, not available on many systems.*/
#if defined(ANDROID) || defined(_WIN32) || defined(__QNX__)
#if (defined(ANDROID) && !defined(__LP64__)) || defined(_WIN32) || defined(__QNX__)
/* This code is public domain -- Will Hartung 4/9/09 */
static ssize_t getline(char **lineptr, size_t *n, FILE *stream) {
char *bufptr = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment