fix: Add support for JSI_PATH env var

facebook · Sep 24, 2022 · 37985a2 · 37985a2
1 parent 2274a9e
commit 37985a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec
@@ -66,25 +66,25 @@ 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
+    ENV['REACT_NATIVE_PATH'] = react_native_path
+    hermes_utils_path = "/sdks/hermes-engine/utils"
 
-      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')}"
+    spec.prepare_command = <<-EOS
+    export BUILD_TYPE=#{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}" : ""}
-      #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
+    # Set HERMES_OVERRIDE_HERMESC_PATH if pre-built HermesC is available
+    #{File.exist?(import_hermesc_file) ? "export HERMES_OVERRIDE_HERMESC_PATH=#{import_hermesc_file}" : ""}
+    #{File.exist?(import_hermesc_file) ? "echo \"Overriding HermesC path...\"" : ""}
 
-      # Build iOS framework
-      #{hermes_utils_path}/build-ios-framework.sh
+    # Build iOS framework
+    $REACT_NATIVE_PATH#{hermes_utils_path}/build-ios-framework.sh
 
-      # Build Mac framework
-      #{hermes_utils_path}/build-mac-framework.sh
+    # Build Mac framework
+    $REACT_NATIVE_PATH#{hermes_utils_path}/build-mac-framework.sh
     EOS
   end
 end
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