diff options
-rwxr-xr-x | aarch64-linux-android-configure | 9 | ||||
-rwxr-xr-x | arm-linux-androideabi-configure | 10 | ||||
-rw-r--r-- | request.h | 15 |
3 files changed, 26 insertions, 8 deletions
diff --git a/aarch64-linux-android-configure b/aarch64-linux-android-configure new file mode 100755 index 0000000..8690ece --- /dev/null +++ b/aarch64-linux-android-configure @@ -0,0 +1,9 @@ +#!/bin/sh +export TOOLCHAIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64 +export TARGET=aarch64-linux-android +export API=21 +export CC=$TOOLCHAIN/bin/$TARGET$API-clang +export PREFIX=$TOOLCHAIN/sysroot/usr +export CPPFLAGS="$CPPFLAGS -DDEBUG" +export CFLAGS="$CFLAGS -g" +./configure --host=$TARGET --prefix=$PREFIX --libdir=$PREFIX/lib/$TARGET/$API --disable-static diff --git a/arm-linux-androideabi-configure b/arm-linux-androideabi-configure new file mode 100755 index 0000000..20d62ec --- /dev/null +++ b/arm-linux-androideabi-configure @@ -0,0 +1,10 @@ +#!/bin/sh +export TOOLCHAIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64 +export TARGET=armv7a-linux-androideabi +export API=16 +export CC=$TOOLCHAIN/bin/$TARGET$API-clang +export TARGET=arm-linux-androideabi +export PREFIX=$TOOLCHAIN/sysroot/usr +export CPPFLAGS="$CPPFLAGS -DDEBUG" +export CFLAGS="$CFLAGS -g" +./configure --host=$TARGET --prefix=$PREFIX --libdir=$PREFIX/lib/$TARGET/$API --disable-static @@ -1,7 +1,7 @@ #ifndef ICCLIENT_REQUEST_H #define ICCLIENT_REQUEST_H -#if defined(ANDROID) && defined(DEBUG) +#if defined __ANDROID__ && defined DEBUG #include <android/log.h> #endif #include <string.h> @@ -77,19 +77,18 @@ inline void request(size_t (*writefunction)(void *, size_t, size_t, void *), #ifdef DEBUG CURLcode res = -#endif // DEBUG +#endif curl_easy_perform(curl); #ifdef DEBUG if (res != CURLE_OK) { const char *error = curl_easy_strerror(res); -#ifdef ANDROID - __android_log_print(ANDROID_LOG_ERROR, "libicclient", "%s: %s", __func__, - error); +#ifdef __ANDROID__ + __android_log_print(ANDROID_LOG_ERROR, "libicclient.so", "%s: %s", __func__, error); #else fprintf(stderr, "%s: %s\n", __func__, error); -#endif // ANDROID +#endif } -#endif // DEBUG +#endif } -#endif // ICCLIENT_REQUEST_H +#endif |