feat(hermes): host objects

Author: ammarahm-ed

test-app/runtime/CMakeLists.txt

@@ -291,11 +291,26 @@ target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/common/${
 #target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/common/${ANDROID_ABI}/libclang_rt.asan-aarch64-android.so)
 
 if (HERMES)
-    # libhermesvm.so (+ libjsi.so) are extracted from the hermes-engine AAR into
-    # src/main/libs/hermes/<abi>.
-    target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/hermes/${ANDROID_ABI}/libhermesvm.so)
-    target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/hermes/${ANDROID_ABI}/libjsi.so)
+    # Select debug or release Hermes .so files based on build type.
+    # Optimized builds use the MinSizeRel release libraries; all other builds
+    # (including regular debug and debugOptimized-with-inspector) use the debug
+    # libraries, which include HERMES_ENABLE_DEBUGGER and full debug info.
+    if (OPTIMIZED_BUILD OR OPTIMIZED_WITH_INSPECTOR_BUILD)
+        set(HERMES_LIB_VARIANT release)
+    else ()
+        set(HERMES_LIB_VARIANT debug)
+    endif ()
+
+    set(HERMES_LIB_DIR ${PROJECT_SOURCE_DIR}/src/main/libs/hermes/${HERMES_LIB_VARIANT}/${ANDROID_ABI})
+    MESSAGE(STATUS "# Hermes lib variant: ${HERMES_LIB_VARIANT} (${HERMES_LIB_DIR})")
+
+    target_link_libraries(NativeScript ${HERMES_LIB_DIR}/libhermesvm.so)
+    target_link_libraries(NativeScript ${HERMES_LIB_DIR}/libjsi.so)
     add_compile_definitions(NativeScript, PRIVATE __HERMES__)
+
+    # napi_create_host_object / napi_get_host_object_data / napi_is_host_object
+    # are compiled into libhermesvm.so (via hermesNapi) when USE_HOST_OBJECT is
+    # set at Hermes build time. No separate .so to link here.
 endif ()
 
 if (JSC)

test-app/runtime/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 
-// can be: "V8-11", "V8-10","V8-13", "JSC", "HERMES", "QUICKJS", "QUICKJS_NG", "SHERMES", "PRIMJS"
+// can be: "V8-11", "V8-10","V8-13", "JSC", "HERMES", "QUICKJS", "QUICKJS_NG", "PRIMJS"
 
-def jsEngine = "V8-13"
+def jsEngine = "HERMES"
 
 def hasEngine = project.hasProperty("engine")
 if (hasEngine) {
     jsEngine = engine
 }
 
-def hasHostObjects = project.hasProperty("useHostObjects")
+def hasHostObjects = true //project.hasProperty("useHostObjects")
 def isNapiModule = project.hasProperty("asNapiModule");
 
 printf("Compiling NativeScript with %s.\n", jsEngine)
@@ -141,9 +141,9 @@ android {
                        arguments.add("-DQUICKJS_NG=1")
                    }
                 } else if (jsEngine == "HERMES") {
+                    // SHERMES is kept as an alias for the static-hermes (hermesvm)
+                    // engine, which is now the canonical HERMES engine.
                     arguments.add("-DHERMES=1")
-                } else if (jsEngine == "SHERMES") {
-                    arguments.add("-DSHERMES=1")  
                 } else if (jsEngine == "PRIMJS") {
                     arguments.add("-DPRIMJS=1")
                 }else if (jsEngine == "JSC") {
@@ -215,7 +215,7 @@ android {
             exclude "**/libjsi.so"
             exclude "**/libfbjni.so"
         }
-    } else if (jsEngine == "HERMES" || jsEngine == "SHERMES") {
+    } else if (jsEngine == "HERMES") {
         packagingOptions {
             exclude "**/libjsc.so"
             exclude '**/libfbjni.so'
@@ -251,7 +251,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" || jsEngine == "SHERMES") {
+    if (jsEngine == "HERMES") {
         implementation 'com.facebook.fbjni:fbjni:0.7.0'
     }
 }