Skip to content

Commit 751b858

Browse files
committed
patch jscexecutor to link libunwind
1 parent 6677eec commit 751b858

File tree

3 files changed

+136
-3
lines changed

3 files changed

+136
-3
lines changed

test/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"android": "react-native run-android",
77
"ios": "react-native run-ios",
88
"lint": "eslint .",
9+
"postinstall": "patch-package",
910
"start": "react-native start",
1011
"test": "jest"
1112
},
@@ -26,6 +27,7 @@
2627
"eslint": "^8.19.0",
2728
"jest": "^29.2.1",
2829
"metro-react-native-babel-preset": "0.73.7",
30+
"patch-package": "^6.5.1",
2931
"prettier": "^2.4.1",
3032
"react-test-renderer": "18.2.0",
3133
"typescript": "4.8.4"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/node_modules/react-native/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt b/node_modules/react-native/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt
2+
index 464aa19..e0c3c8e 100644
3+
--- a/node_modules/react-native/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt
4+
+++ b/node_modules/react-native/ReactAndroid/src/main/jni/react/jscexecutor/CMakeLists.txt
5+
@@ -16,6 +16,7 @@ target_include_directories(jscexecutor PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
6+
target_link_libraries(jscexecutor
7+
jsireact
8+
jscruntime
9+
+ unwind
10+
fb
11+
fbjni
12+
folly_runtime

test/yarn.lock

Lines changed: 122 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,6 +2261,11 @@
22612261
"@typescript-eslint/types" "5.50.0"
22622262
eslint-visitor-keys "^3.3.0"
22632263

2264+
"@yarnpkg/lockfile@^1.1.0":
2265+
version "1.1.0"
2266+
resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
2267+
integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
2268+
22642269
abort-controller@^3.0.0:
22652270
version "3.0.0"
22662271
resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -2476,6 +2481,11 @@ async@^3.2.2:
24762481
resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
24772482
integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
24782483

2484+
at-least-node@^1.0.0:
2485+
version "1.0.0"
2486+
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
2487+
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
2488+
24792489
atob@^2.1.2:
24802490
version "2.1.2"
24812491
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -3069,7 +3079,7 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
30693079
js-yaml "^3.13.1"
30703080
parse-json "^4.0.0"
30713081

3072-
cross-spawn@^6.0.0:
3082+
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
30733083
version "6.0.5"
30743084
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
30753085
integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3822,6 +3832,13 @@ find-up@^5.0.0:
38223832
locate-path "^6.0.0"
38233833
path-exists "^4.0.0"
38243834

3835+
find-yarn-workspace-root@^2.0.0:
3836+
version "2.0.0"
3837+
resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
3838+
integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
3839+
dependencies:
3840+
micromatch "^4.0.2"
3841+
38253842
flat-cache@^3.0.4:
38263843
version "3.0.4"
38273844
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -3878,6 +3895,16 @@ fs-extra@^8.1.0:
38783895
jsonfile "^4.0.0"
38793896
universalify "^0.1.0"
38803897

3898+
fs-extra@^9.0.0:
3899+
version "9.1.0"
3900+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
3901+
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
3902+
dependencies:
3903+
at-least-node "^1.0.0"
3904+
graceful-fs "^4.2.0"
3905+
jsonfile "^6.0.1"
3906+
universalify "^2.0.0"
3907+
38813908
fs.realpath@^1.0.0:
38823909
version "1.0.0"
38833910
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -4307,6 +4334,13 @@ is-callable@^1.1.4, is-callable@^1.2.4:
43074334
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
43084335
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
43094336

4337+
is-ci@^2.0.0:
4338+
version "2.0.0"
4339+
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
4340+
integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
4341+
dependencies:
4342+
ci-info "^2.0.0"
4343+
43104344
is-core-module@^2.9.0:
43114345
version "2.9.0"
43124346
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -4358,6 +4392,11 @@ is-directory@^0.3.1:
43584392
resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
43594393
integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==
43604394

4395+
is-docker@^2.0.0:
4396+
version "2.2.1"
4397+
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
4398+
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
4399+
43614400
is-extendable@^0.1.0, is-extendable@^0.1.1:
43624401
version "0.1.1"
43634402
resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4510,6 +4549,13 @@ is-wsl@^1.1.0:
45104549
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
45114550
integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
45124551

4552+
is-wsl@^2.1.1:
4553+
version "2.2.0"
4554+
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
4555+
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
4556+
dependencies:
4557+
is-docker "^2.0.0"
4558+
45134559
[email protected], isarray@~1.0.0:
45144560
version "1.0.0"
45154561
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -5111,6 +5157,15 @@ jsonfile@^4.0.0:
51115157
optionalDependencies:
51125158
graceful-fs "^4.1.6"
51135159

5160+
jsonfile@^6.0.1:
5161+
version "6.1.0"
5162+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
5163+
integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
5164+
dependencies:
5165+
universalify "^2.0.0"
5166+
optionalDependencies:
5167+
graceful-fs "^4.1.6"
5168+
51145169
"jsx-ast-utils@^2.4.1 || ^3.0.0":
51155170
version "3.3.2"
51165171
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz#afe5efe4332cd3515c065072bd4d6b0aa22152bd"
@@ -5143,6 +5198,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
51435198
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
51445199
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
51455200

5201+
klaw-sync@^6.0.0:
5202+
version "6.0.0"
5203+
resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
5204+
integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
5205+
dependencies:
5206+
graceful-fs "^4.1.11"
5207+
51465208
kleur@^3.0.3:
51475209
version "3.0.3"
51485210
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -5591,7 +5653,7 @@ micromatch@^3.1.10:
55915653
snapdragon "^0.8.1"
55925654
to-regex "^3.0.2"
55935655

5594-
micromatch@^4.0.4:
5656+
micromatch@^4.0.2, micromatch@^4.0.4:
55955657
version "4.0.5"
55965658
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
55975659
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5916,6 +5978,14 @@ open@^6.2.0:
59165978
dependencies:
59175979
is-wsl "^1.1.0"
59185980

5981+
open@^7.4.2:
5982+
version "7.4.2"
5983+
resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
5984+
integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
5985+
dependencies:
5986+
is-docker "^2.0.0"
5987+
is-wsl "^2.1.1"
5988+
59195989
optionator@^0.9.1:
59205990
version "0.9.1"
59215991
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -5943,7 +6013,7 @@ ora@^5.4.1:
59436013
strip-ansi "^6.0.0"
59446014
wcwidth "^1.0.1"
59456015

5946-
os-tmpdir@^1.0.0:
6016+
os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
59476017
version "1.0.2"
59486018
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
59496019
integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
@@ -6028,6 +6098,26 @@ pascalcase@^0.1.1:
60286098
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
60296099
integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
60306100

6101+
patch-package@^6.5.1:
6102+
version "6.5.1"
6103+
resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621"
6104+
integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==
6105+
dependencies:
6106+
"@yarnpkg/lockfile" "^1.1.0"
6107+
chalk "^4.1.2"
6108+
cross-spawn "^6.0.5"
6109+
find-yarn-workspace-root "^2.0.0"
6110+
fs-extra "^9.0.0"
6111+
is-ci "^2.0.0"
6112+
klaw-sync "^6.0.0"
6113+
minimist "^1.2.6"
6114+
open "^7.4.2"
6115+
rimraf "^2.6.3"
6116+
semver "^5.6.0"
6117+
slash "^2.0.0"
6118+
tmp "^0.0.33"
6119+
yaml "^1.10.2"
6120+
60316121
path-exists@^3.0.0:
60326122
version "3.0.0"
60336123
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6528,6 +6618,13 @@ reusify@^1.0.4:
65286618
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
65296619
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
65306620

6621+
rimraf@^2.6.3:
6622+
version "2.7.1"
6623+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
6624+
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
6625+
dependencies:
6626+
glob "^7.1.3"
6627+
65316628
rimraf@^3.0.2:
65326629
version "3.0.2"
65336630
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -6718,6 +6815,11 @@ sisteransi@^1.0.5:
67186815
resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
67196816
integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
67206817

6818+
slash@^2.0.0:
6819+
version "2.0.0"
6820+
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
6821+
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
6822+
67216823
slash@^3.0.0:
67226824
version "3.0.0"
67236825
resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -7061,6 +7163,13 @@ through2@^2.0.1:
70617163
readable-stream "~2.3.6"
70627164
xtend "~4.0.1"
70637165

7166+
tmp@^0.0.33:
7167+
version "0.0.33"
7168+
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
7169+
integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
7170+
dependencies:
7171+
os-tmpdir "~1.0.2"
7172+
70647173
70657174
version "1.0.5"
70667175
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -7232,6 +7341,11 @@ universalify@^0.1.0:
72327341
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
72337342
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
72347343

7344+
universalify@^2.0.0:
7345+
version "2.0.0"
7346+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
7347+
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
7348+
72357349
unpipe@~1.0.0:
72367350
version "1.0.0"
72377351
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -7468,6 +7582,11 @@ yallist@^4.0.0:
74687582
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
74697583
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
74707584

7585+
yaml@^1.10.2:
7586+
version "1.10.2"
7587+
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
7588+
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
7589+
74717590
yargs-parser@^18.1.2:
74727591
version "18.1.3"
74737592
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"

0 commit comments

Comments
 (0)