fix: Add support for JSI_PATH env var

facebook · Sep 23, 2022 · db71a89 · db71a89
1 parent f0cca8a
commit db71a89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec
@@ -65,13 +65,11 @@ Pod::Spec.new do |spec|
   if source[:git] then
     hermes_utils_path = "#{react_native_path}/sdks/hermes-engine/utils"
     spec.prepare_command = <<-EOS
-      # When true, debug build will be used.
-      # See `build-apple-framework.sh` for details
-
       export BUILD_TYPE=#{get_hermes_build_type.to_s.capitalize}
       export RELEASE_VERSION="#{version}"
       export IOS_DEPLOYMENT_TARGET="#{spec.deployment_target('ios')}"
       export MAC_DEPLOYMENT_TARGET="#{spec.deployment_target('osx')}"
+      export JSI_PATH="#{react_native_path}/ReactCommon/jsi"
 
       # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
       #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}

diff --git a/sdks/hermes-engine/utils/build-apple-framework.sh b/sdks/hermes-engine/utils/build-apple-framework.sh
@@ -7,7 +7,9 @@
 NUM_CORES=$(sysctl -n hw.ncpu)
 IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
 REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$PWD/../..}
-JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+if [[ -z JSI_PATH ]]; then
+  JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
+fi
 
 function use_env_var_or_ruby_prop {
   if [[ -n "$1" ]]; then