primjs: remove cpp shared lib

Author: ammarahm-ed

test-app/runtime/CMakeLists.txt

@@ -61,7 +61,6 @@ include_directories(
         src/main/cpp/runtime/objectmanager
         src/main/cpp/runtime/performance
         src/main/cpp/runtime/profiler
-        src/main/cpp/runtime/robinhood
         src/main/cpp/runtime/sighandler
         src/main/cpp/runtime/timers
         src/main/cpp/runtime/util
@@ -99,17 +98,35 @@ if (QUICKJS)
             src/main/cpp/napi/quickjs/quickjs-api.c
             src/main/cpp/napi/quickjs/jsr.cpp
 
+
     )
     include_directories(
             src/main/cpp/napi/quickjs
             src/main/cpp/napi/quickjs/source
+            src/main/cpp/napi/quickjs/napi-new
             src/main/cpp/napi/common
             # mimalloc
             src/main/cpp/napi/quickjs/mimalloc-dev/include
     )
 
 endif ()
 
+
+if (PRIMJS)
+    set(SOURCES ${SOURCES}
+            src/main/cpp/napi/primjs/jsr.cpp
+            src/main/cpp/napi/primjs/code_cache.cc
+            src/main/cpp/napi/primjs/primjs-api.cc
+            src/main/cpp/napi/primjs/napi_env.cc
+    )
+    include_directories(
+            src/main/cpp/napi/primjs
+            src/main/cpp/napi/primjs/include
+            src/main/cpp/napi/common
+    )
+
+endif ()
+
 if (HERMES)
     include_directories(
          src/main/cpp/napi/hermes
@@ -121,6 +138,17 @@ if (HERMES)
       )
 endif ()
 
+if (SHERMES)
+    include_directories(
+         src/main/cpp/napi/hermes
+         src/main/cpp/napi/hermes/include_shermes
+         src/main/cpp/napi/common
+    )
+    set(SOURCES ${SOURCES}
+        src/main/cpp/napi/hermes/jsr.cpp
+      )
+endif ()
+
 if (JSC)
     include_directories(
             src/main/cpp/napi/jsc
@@ -214,6 +242,13 @@ MESSAGE(STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
 target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/common/${ANDROID_ABI}/libzip.a)
 #target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/common/${ANDROID_ABI}/libclang_rt.asan-aarch64-android.so)
 
+if (SHERMES)
+    target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/shermes/${ANDROID_ABI}/libhermesvm.so)
+    target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/shermes/${ANDROID_ABI}/libjsi.so)
+    add_compile_definitions(NativeScript, PRIVATE __HERMES__)
+    add_compile_definitions(NativeScript, PRIVATE __SHERMES__)
+endif ()
+
 if (HERMES)
     target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/hermes/${ANDROID_ABI}/libhermes.so)
     target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/hermes/${ANDROID_ABI}/libjsi.so)
@@ -230,6 +265,12 @@ if (V8)
     add_compile_definitions(NativeScript, PRIVATE __V8__)
 endif ()
 
+if (PRIMJS)
+    # target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/primjs/${ANDROID_ABI}/libnapi.so)
+    target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/primjs/${ANDROID_ABI}/libquick.so)
+    add_compile_definitions(NativeScript, PRIVATE __PRIMJS__)
+endif ()
+
 if (QUICKJS)
     add_compile_definitions(NativeScript, PRIVATE __QJS__)
     if (USE_MIMALLOC)
@@ -266,10 +307,10 @@ if (QUICKJS)
     else ()
         target_link_libraries(NativeScript ${system-log} ${system-z} ${system-android})
     endif ()
-elseif (HERMES)
+elseif (HERMES OR SHERMES)
     find_package(fbjni REQUIRED CONFIG)
     target_link_libraries(NativeScript ${system-log} ${system-z} fbjni::fbjni ${system-android})
-elseif (JSC OR V8)
+elseif (JSC OR V8 OR PRIMJS)
     target_link_libraries(NativeScript ${system-log} ${system-z} ${system-android})
 endif ()
 

test-app/runtime/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 
-// can be: "V8", "JSC", "HERMES", "QUICKJS"
+// can be: "V8", "JSC", "HERMES", "QUICKJS", "SHERMES", "PRIMJS"
 def jsEngine = "V8"
 def hasEngine = project.hasProperty("engine")
 if (hasEngine) {
@@ -133,7 +133,12 @@ android {
                     arguments.add("-DUSE_MIMALLOC=1")
                 } else if (jsEngine == "HERMES") {
                     arguments.add("-DHERMES=1")
-                } else if (jsEngine == "JSC") {
+                } else if (jsEngine == "SHERMES") {
+                    arguments.add("-DSHERMES=1")  
+                } else if (jsEngine == "PRIMJS") {
+                    arguments.add("-DPRIMJS=1")
+
+                }else if (jsEngine == "JSC") {
                     arguments.add("-DJSC=1")
                 } else if (jsEngine == "V8") {
                     arguments.add("-DV8=1")
@@ -179,7 +184,7 @@ android {
             exclude "**/libjsi.so"
             exclude "**/libfbjni.so"
         }
-    } else if (jsEngine == "HERMES") {
+    } else if (jsEngine == "HERMES" || jsEngine == "SHERMES") {
         packagingOptions {
             exclude "**/libjsc.so"
             exclude "**/libv8.so"
@@ -192,7 +197,7 @@ android {
             exclude "**/libhermes.so"
             exclude "**/libjsi.so"
         }
-    } else if (jsEngine == "QUICKJS") {
+    } else if (jsEngine == "QUICKJS" || jsEngine == "PRIMJS") {
         packagingOptions {
             exclude "**/libv8.so"
             exclude "**/libhermes.so"
@@ -217,7 +222,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation "junit:junit:${ns_default_junit_version}"
     testImplementation "org.mockito:mockito-core:${ns_default_mockito_core_version}"
-    if (jsEngine == "HERMES") {
+    if (jsEngine == "HERMES" || jsEngine == "SHERMES") {
         implementation 'com.facebook.fbjni:fbjni:0.3.0'
     }
 }