Add Android CI

.github/workflows/ci.yml

@@ -499,3 +499,19 @@ jobs:
  gmake
  gmake stats
  gmake test
+
+ android:
+ runs-on: ubuntu-latest
+ container: reactnativecommunity/react-native-android:v13.0
+ steps:
+ - uses: actions/checkout@v4
+ - name: Configure android arm64
+ # see build options you can use in https://developer.android.com/ndk/guides/cmake
+ run: |
+ mkdir build
+ cd build
+ $ANDROID_HOME/cmake/3.22.1/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/26.0.10792818/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 ..
+ - name: Build android arm64
+ run: |
+ $ANDROID_HOME/cmake/3.22.1/bin/cmake --build build --target qjs
+ ls -lh build

cutils.h

@@ -38,9 +38,7 @@
 #endif
 #if defined(__APPLE__)
 #include <malloc/malloc.h>
-#elif defined(__ANDROID__)
-#include <dlmalloc.h>
-#elif defined(__linux__) || defined(__CYGWIN__)
+#elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
 #include <malloc.h>
 #elif defined(__FreeBSD__)
 #include <malloc_np.h>
@@ -421,9 +419,7 @@ static inline size_t js__malloc_usable_size(const void *ptr)
  return malloc_size(ptr);
 #elif defined(_WIN32)
  return _msize((void *)ptr);
-#elif defined(__ANDROID__)
- return dlmalloc_usable_size((void *)ptr);
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__FreeBSD__)
  return malloc_usable_size((void *)ptr);
 #else
  return 0;

quickjs.c

@@ -1734,17 +1734,7 @@ static const JSMallocFunctions def_malloc_funcs = {
  js_def_malloc,
  js_def_free,
  js_def_realloc,
-#if defined(__APPLE__)
- malloc_size,
-#elif defined(_WIN32)
- (size_t (*)(const void *))_msize,
-#elif defined(__ANDROID__)
- (size_t (*)(const void *))dlmalloc_usable_size,
-#elif defined(__linux__) || defined (__CYGWIN__)
- (size_t (*)(const void *))malloc_usable_size,
-#else
- NULL,
-#endif
+ js__malloc_usable_size
 };
 
 JSRuntime *JS_NewRuntime(void)