From e739ca2affa1237089857b5e1c87afeac25449aa Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Fri, 20 Sep 2019 16:58:12 +0200 Subject: [HICN-284] Android log for libparc Signed-off-by: Angelo Mantellini Change-Id: Iaec9ec7cd125eb4f9a391cd917a85a972e1c50b2 --- libparc/parc/CMakeLists.txt | 2 +- libparc/parc/algol/parc_FileOutputStream.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libparc/parc') diff --git a/libparc/parc/CMakeLists.txt b/libparc/parc/CMakeLists.txt index df582a35..62c81b6e 100644 --- a/libparc/parc/CMakeLists.txt +++ b/libparc/parc/CMakeLists.txt @@ -392,7 +392,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR COMPILE_FOR_IOS) set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -undefined dynamic_lookup") message( "-- Set \"-undefined dynamic_lookup\" for shared libraries") endif() -if(COMPILE_FOR_IOS OR ANDROID_API) +if(COMPILE_FOR_IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Android") add_library(parc STATIC ${LIBPARC_SOURCE_FILES} ${LIBEVENT_LIBRARIES} ${OPENSSL_LIBRARIES}) target_link_libraries(parc ${LIBEVENT_LIBRARIES}) target_link_libraries(parc ${OPENSSL_LIBRARIES}) diff --git a/libparc/parc/algol/parc_FileOutputStream.c b/libparc/parc/algol/parc_FileOutputStream.c index c119e67f..b11280aa 100644 --- a/libparc/parc/algol/parc_FileOutputStream.c +++ b/libparc/parc/algol/parc_FileOutputStream.c @@ -17,6 +17,10 @@ #include #endif +#ifdef __ANDROID__ +#include +#endif + #include #include @@ -74,10 +78,14 @@ parcFileOutputStream_Write(PARCFileOutputStream *outputStream, PARCBuffer *buffe size_t remaining = parcBuffer_Remaining(buffer); size_t chunkSize = remaining > maximumChunkSize ? maximumChunkSize : remaining; void *buf = parcBuffer_Overlay(buffer, chunkSize); +#ifdef __ANDROID__ + __android_log_print(ANDROID_LOG_INFO,"PARC", "%.*s", (int)chunkSize, buf); +#else ssize_t nwritten = write(outputStream->fd, buf, (unsigned int)chunkSize); if (nwritten == -1) { break; } +#endif } return parcBuffer_HasRemaining(buffer) == false; -- cgit 1.2.3-korg