diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index 25004a944..194691200 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -34,7 +34,7 @@ jobs: id: compile env: COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror" - DROID_FLAGS: "-fPIC -shared -s -O1 -fvisibility=hidden -rdynamic -funwind-tables" + DROID_FLAGS: "-fPIC -shared -fvisibility=hidden -rdynamic -funwind-tables" DROID_LIBS: "-lGLESv2 -lEGL -lm -landroid -llog" run: | LATEST_FLAG=-DCC_COMMIT_SHA=\"${GITHUB_SHA::9}\" @@ -48,11 +48,11 @@ jobs: SDK_ROOT="/opt/android-sdk-linux/platforms/android-34" cd $ROOT_DIR/src - $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $DROID_FLAGS -march=armv5 -rtlib=libgcc -L $ROOT_DIR/build-tools/runtime $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_16 - $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_32 - $NDK_ROOT/aarch64-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_64 - $NDK_ROOT/i686-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_32 - $NDK_ROOT/x86_64-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_64 + $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $COMMON_FLAGS $DROID_FLAGS -march=armv5 -rtlib=libgcc -L $ROOT_DIR/build-tools/runtime $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_16 + $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_32 + $NDK_ROOT/aarch64-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_64 + $NDK_ROOT/i686-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_32 + $NDK_ROOT/x86_64-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_64 cd $ROOT_DIR/android/app/src/main # copy required native libraries diff --git a/src/Http_Worker.c b/src/Http_Worker.c index f9c14c6b1..97bcbdcf2 100644 --- a/src/Http_Worker.c +++ b/src/Http_Worker.c @@ -1086,7 +1086,7 @@ static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) { Http_AddHeader(req, "User-Agent", Http_GetUserAgent_UNSAFE()); if (req->data) { - if (res = Http_SetData(env, req)) return res; + if ((res = Http_SetData(env, req))) return res; HttpRequest_Free(req); } diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c index 80d8c1892..4f9655ea4 100644 --- a/src/Platform_Posix.c +++ b/src/Platform_Posix.c @@ -458,7 +458,7 @@ void Thread_Run(void** handle, Thread_StartFunc func, int stackSize, const char* extern int pthread_set_name_np(pthread_t thread, const char* name); pthread_set_name_np(*ptr, name); #elif defined CC_BUILD_NETBSD - pthread_setname_np(*ptr, "%s", name); + pthread_setname_np(*ptr, "%s", (void*)name); #endif }