Skip to content

Commit 509a07b

Browse files
Kudofacebook-github-bot
authored andcommitted
Remove unreliable packagingOptions.pickFirst for libc++_shared.so and libjsc.so (#24672)
Summary: packagingOptions.pickFirst is unreliable that we could not specify which library will be used. If user have other third party libraries, the story is more complicated. From the framework point of view, it is better to drop the pickFirst. In jsc-android 241213.1.0, we did two things: 1. Remove libc++_shared.so in AAR to prevent the conflict with RN. 2. Build by NDK r17c, which aligned with current RN NDK version. In this commit, I also revert the pickFirst for JSC. pickFirst JSC also makes upgrade JSC unreliable. Currently a lot of user report JSC crash issues, those crash issues may relate to JIT and hard to reproduce in-house. My plan is to make sure user could choose another JSC build easier, i.e. only to `yarn add 'jsc-android@latest'`. We could then propose some experimented JSC build for user to check if the build could help them to fix the crash issue. [Android] [Fixed] - Remove unreliable packagingOptions.pickFirst for libc++_shared.so and libjsc.so NOTE that this may not need to add the changelog, as RN 0.59 does not have pickFirst. This will also reduce a breaking change for upgrade from RN 0.59 or before. Pull Request resolved: #24672 Differential Revision: D15164536 Pulled By: cpojer fbshipit-source-id: 9fc897a77409173a5841f325b38e2836bb07f599
1 parent d06983f commit 509a07b

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

RNTester/android/app/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,6 @@ android {
138138
signingConfig signingConfigs.release
139139
}
140140
}
141-
packagingOptions {
142-
pickFirst '**/armeabi-v7a/libc++_shared.so'
143-
pickFirst '**/x86/libc++_shared.so'
144-
pickFirst '**/x86_64/libc++_shared.so'
145-
pickFirst '**/arm64-v8a/libc++_shared.so'
146-
}
147141
}
148142

149143
dependencies {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"fbjs": "^1.0.0",
9393
"fbjs-scripts": "^1.1.0",
9494
"invariant": "^2.2.4",
95-
"jsc-android": "^236355.1.1",
95+
"jsc-android": "^241213.1.0",
9696
"metro-babel-register": "0.52.0",
9797
"metro-react-native-babel-transformer": "0.52.0",
9898
"nullthrows": "^1.1.0",

template/android/app/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,6 @@ android {
161161
}
162162
}
163163
}
164-
165-
packagingOptions {
166-
pickFirst '**/armeabi-v7a/libc++_shared.so'
167-
pickFirst '**/x86/libc++_shared.so'
168-
pickFirst '**/arm64-v8a/libc++_shared.so'
169-
pickFirst '**/x86_64/libc++_shared.so'
170-
pickFirst '**/x86/libjsc.so'
171-
pickFirst '**/armeabi-v7a/libjsc.so'
172-
}
173164
}
174165

175166
dependencies {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4449,10 +4449,10 @@ jsbn@~0.1.0:
44494449
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
44504450
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
44514451

4452-
jsc-android@^236355.1.1:
4453-
version "236355.1.1"
4454-
resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-236355.1.1.tgz#43e153b722e3c60dd0595be4e7430baf65e67c9c"
4455-
integrity sha512-2py4f0McZIl/oH6AzPj1Ebutc58fyeLvwq6gyVYp1RsWr4qeLNHAPfW3kmfeVMz44oUBJMQ0lECZg9n4KBhHbQ==
4452+
jsc-android@^241213.1.0:
4453+
version "241213.1.0"
4454+
resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-241213.1.0.tgz#8f940d7c7f6bebf14eda32bef42a76182e336452"
4455+
integrity sha512-AH8NYyMNLNhcUEF97QbMxPNLNW+oiSBlvm1rsMNzgJ1d5TQzdh/AOJGsxeeESp3m9YIWGLCgUvGTVoVLs0p68A==
44564456

44574457
jscodeshift@^0.6.2:
44584458
version "0.6.2"

0 commit comments

Comments
 (0)