✨ feat: Add android node to cmake

Author: caoccao

cpp/CMakeLists.txt

@@ -117,27 +117,35 @@ if(DEFINED NODE_DIR)
     list(APPEND importLibraries
         ada base64 brotli cares histogram llhttp nghttp2 nghttp3 ngtcp2 openssl simdutf torque_base uvwasi
         v8_base_without_compiler v8_compiler v8_init v8_initializers
-        v8_libbase v8_libplatform v8_snapshot v8_turboshaft v8_zlib zlib zlib_adler32_simd zlib_inflate_chunk_simd)
-    if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)")
+        v8_libbase v8_libplatform v8_snapshot v8_turboshaft v8_zlib zlib)
+    # base64
+    if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)" OR CMAKE_ANDROID_ARCH STREQUAL "arm64")
         list(APPEND importLibraries base64_neon64)
-    else()
+    elseif(NOT CMAKE_ANDROID_ARCH STREQUAL "arm")
         list(APPEND importLibraries base64_avx base64_avx2 base64_avx512 base64_sse41 base64_sse42 base64_ssse3)
     endif()
+    # node, uv
     if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
         list(APPEND importLibraries libnode libuv)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)")
-        list(APPEND importLibraries node uv)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
-        list(APPEND importLibraries node node_text_start uv)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    else()
         list(APPEND importLibraries node uv)
     endif()
-    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
-        list(APPEND importLibraries zlib_arm_crc32)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)")
-        list(APPEND importLibraries zlib_arm_crc32)
-    # else()
-    #     list(APPEND importLibraries zlib_crc32_simd)
+    # node_text_start
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        list(APPEND importLibraries node_text_start)
+    endif()
+    # zlib
+    if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+        if(CMAKE_ANDROID_ARCH STREQUAL "arm64")
+            list(APPEND importLibraries zlib_adler32_simd zlib_arm_crc32)
+        elseif(CMAKE_ANDROID_ARCH MATCHES "(x86|x86_64)")
+            list(APPEND importLibraries zlib_adler32_simd zlib_inflate_chunk_simd)
+        endif()
+    else()
+        list(APPEND importLibraries zlib_adler32_simd zlib_inflate_chunk_simd)
+        if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)")
+            list(APPEND importLibraries zlib_arm_crc32)
+        endif()
     endif()
     add_definitions(-DENABLE_NODE)
     set(JAVET_LIB_TYPE "node")
@@ -247,6 +255,20 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android
             target_link_libraries(JavetStatic PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive
                 -llog -static-libgcc -static-libstdc++ "${libgcc}")
         endif()
+        if(DEFINED NODE_DIR)
+            list(APPEND includeDirs
+                ${NODE_DIR}/out.${CMAKE_ANDROID_ARCH}/Release/obj/gen/generate-bytecode-output-root
+                ${NODE_DIR}/out.${CMAKE_ANDROID_ARCH}/Release/obj/gen/inspector-generated-output-root
+                ${NODE_DIR}/out.${CMAKE_ANDROID_ARCH}/Release/obj/gen)
+            foreach(importLibrary ${importLibraries})
+                set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${NODE_DIR}/out.${CMAKE_ANDROID_ARCH}/Release/lib${importLibrary}.a)
+            endforeach(importLibrary)
+            list(REMOVE_ITEM importLibraries v8_init)
+            target_link_libraries(Javet PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive
+                v8_init -llog -static-libgcc -static-libstdc++ "${libgcc}")
+            target_link_libraries(JavetStatic PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive
+                v8_init -llog -static-libgcc -static-libstdc++ "${libgcc}")
+        endif()
     elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "(arm64|x86_64)")
         set(JAVET_LIB_SYSTEM "macos")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-ambiguous-reversed-operator ")

cpp/jni/javet_v8_runtime.h

@@ -169,10 +169,6 @@ namespace Javet {
         virtual ~V8Runtime();
 
     private:
-        std::unique_ptr<v8::SnapshotCreator> v8SnapshotCreator;
-        std::unique_ptr<v8::StartupData, std::function<void(v8::StartupData*)>> v8StartupData;
-        std::shared_ptr<v8::Locker> v8Locker;
-        V8PersistentContext v8PersistentContext;
 #ifdef ENABLE_NODE
         // The following Node objects must be live as long as V8 context lives.
         std::shared_ptr<node::ArrayBufferAllocator> nodeArrayBufferAllocator;
@@ -182,6 +178,10 @@ namespace Javet {
 #else
         std::shared_ptr<V8ArrayBufferAllocator> v8ArrayBufferAllocator;
 #endif
+        std::unique_ptr<v8::SnapshotCreator> v8SnapshotCreator;
+        std::unique_ptr<v8::StartupData, std::function<void(v8::StartupData*)>> v8StartupData;
+        std::shared_ptr<v8::Locker> v8Locker;
+        V8PersistentContext v8PersistentContext;
     };
 }
 

scripts/patches/android/node/constants-arm.h.patch

@@ -0,0 +1,18 @@
+diff --git a/deps/v8/src/codegen/arm/constants-arm.h b/deps/v8/src/codegen/arm/constants-arm.h
+index 5b8636d3b9..ff6dea9a58 100644
+--- a/deps/v8/src/codegen/arm/constants-arm.h
++++ b/deps/v8/src/codegen/arm/constants-arm.h
+@@ -179,7 +179,13 @@ constexpr int U = 1 << 23;  // Positive (or negative) offset/index.
+ constexpr int P =
+     1 << 24;  // Offset/pre-indexed addressing (or post-indexed addressing).
+ constexpr int I = 1 << 25;  // Immediate shifter operand (or not).
++#ifdef B0
++#undef B0
++// ensure safe undef
++#define B0 undefined
++#else
+ constexpr int B0 = 1 << 0;
++#endif
+ constexpr int B4 = 1 << 4;
+ constexpr int B5 = 1 << 5;
+ constexpr int B6 = 1 << 6;