Skip to content

Commit 6f43ef8

Browse files
committed
Make sure we can use Hermes V1 from RNTester
1 parent 2f85212 commit 6f43ef8

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

packages/react-native/sdks/hermes-engine/hermes-engine.podspec

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ end
2222
package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
2323
versionProperties = Hash[*File.read("version.properties").split(/[=\n]+/)]
2424

25-
if ENV['RCT_HERMES_V1_ENABLED'] == "1"
26-
version = versionProperties['HERMES_V1_VERSION_NAME']
27-
else
25+
if ENV['RCT_HERMES_V1_ENABLED'] == "0"
2826
version = versionProperties['HERMES_VERSION_NAME']
27+
else
28+
version = versionProperties['HERMES_V1_VERSION_NAME']
2929
end
3030

3131
# Local monorepo build
32-
if package['version'] == "1000.0.0" then
32+
# We don't want to build Hermes V1 from source
33+
if ENV['RCT_HERMES_V1_ENABLED'] == "0" && package['version'] == "1000.0.0" then
3334
hermesCompilerVersion = package['dependencies']['hermes-compiler']
3435
if hermesCompilerVersion != "0.0.0" then
3536
version = hermesCompilerVersion
@@ -131,7 +132,7 @@ Pod::Spec.new do |spec|
131132
ss.header_dir = 'hermes/Public'
132133
end
133134

134-
if ENV['RCT_HERMES_V1_ENABLED'] != "1"
135+
if ENV['RCT_HERMES_V1_ENABLED'] == "0"
135136
spec.subspec 'inspector' do |ss|
136137
ss.source_files = ''
137138
ss.public_header_files = 'API/hermes/inspector/*.h'

packages/react-native/sdks/hermes-engine/hermes-utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def hermes_commit_envvar_defined()
8686
end
8787

8888
def hermes_v1_enabled()
89-
return ENV['RCT_HERMES_V1_ENABLED'] == "1"
89+
return ENV['RCT_HERMES_V1_ENABLED'] == "1" || !ENV['RCT_HERMES_V1_ENABLED']
9090
end
9191

9292
def force_build_from_tag(react_native_path)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
HERMES_VERSION_NAME=1000.0.0
2-
HERMES_V1_VERSION_NAME=250829098.0.1
2+
HERMES_V1_VERSION_NAME=250829098.0.4

0 commit comments

Comments
 (0)