generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-10 03:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix Android port: (#1933)

Browse Source 
- Switch to clang from gcc
- std::timed_mutex is not available on the latest NDK, revert to the POSIX implementation for now
- eabi is deprecated, switch to eabi-v7a by default
This commit is contained in:
Rangel Reale 2017-10-11 13:34:38 -03:00 committed by Aleksandar Fabijanic
parent 6e6e3952e2
commit 6bfbd5db96
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/include/Poco/Mutex.h
View File

@ -22,7 +22,7 @@
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/ScopedLock.h" #include "Poco/ScopedLock.h"
#if (POCO_OS == POCO_OS_CYGWIN) #if (POCO_OS == POCO_OS_CYGWIN || defined(POCO_ANDROID))
#include "Poco/Mutex_POSIX.h" #include "Poco/Mutex_POSIX.h"
#else #else
#include "Poco/Mutex_STD.h" #include "Poco/Mutex_STD.h"

2
Foundation/src/Mutex.cpp
View File

@ -13,7 +13,7 @@
#include "Poco/Mutex.h" #include "Poco/Mutex.h"
#if (POCO_OS == POCO_OS_CYGWIN) #if (POCO_OS == POCO_OS_CYGWIN || defined(POCO_ANDROID))
#include "Mutex_POSIX.cpp" #include "Mutex_POSIX.cpp"
#else #else
#include "Mutex_STD.cpp" #include "Mutex_STD.cpp"

16
build/config/Android
View File

@ -8,7 +8,7 @@
# General Settings # General Settings
# #
LINKMODE ?= STATIC LINKMODE ?= STATIC
ANDROID_ABI ?= armeabi ANDROID_ABI ?= armeabi-v7a
POCO_TARGET_OSNAME = Android POCO_TARGET_OSNAME = Android
POCO_TARGET_OSARCH = $(ANDROID_ABI) POCO_TARGET_OSARCH = $(ANDROID_ABI)
@ -33,8 +33,8 @@ endif
# #
# Define Tools # Define Tools
# #
CC = $(TOOL)-gcc CC = $(TOOL)-clang
CXX = $(TOOL)-g++ CXX = $(TOOL)-clang++
LINK = $(CXX) LINK = $(CXX)
STRIP = $(TOOL)-strip STRIP = $(TOOL)-strip
LIB = $(TOOL)-ar -cr LIB = $(TOOL)-ar -cr
@ -56,10 +56,10 @@ SHAREDLIBLINKEXT = .so
# #
# Compiler and Linker Flags # Compiler and Linker Flags
# #
CFLAGS = $(ARCHFLAGS) -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing -finline-limit=64 CFLAGS = $(ARCHFLAGS) -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing
CFLAGS32 = CFLAGS32 =
CFLAGS64 = CFLAGS64 =
CXXFLAGS = $(ARCHFLAGS) -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing -finline-limit=64 -frtti -fexceptions CXXFLAGS = $(ARCHFLAGS) -fpic -ffunction-sections -funwind-tables -fstack-protector -fno-strict-aliasing -frtti -fexceptions
CXXFLAGS32 = CXXFLAGS32 =
CXXFLAGS64 = CXXFLAGS64 =
LINKFLAGS += LINKFLAGS +=
@ -87,3 +87,9 @@ SYSFLAGS = -DPOCO_ANDROID -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SH
# System Specific Libraries # System Specific Libraries
# #
SYSLIBS = -lstdc++ -lsupc++ SYSLIBS = -lstdc++ -lsupc++
#
# C++11/14 detection
#
include $(POCO_BASE)/build/script/cpp11-clang