diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 6046b5dd51d..82e6a7c1171 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -86,6 +86,17 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy include "folly-${FOLLY_VERSION}/folly/**/*", 'Android.mk' eachFile {fname -> fname.path = (fname.path - "folly-${FOLLY_VERSION}/")} includeEmptyDirs = false + + // Patch for folly build break on gcc 4.9 and could be removed after build by clang + filesMatching('**/container/detail/F14Policy.h') { + filter(ReplaceTokens, tokens: [ + 'ObjectHolder(Args&&... args) : value_{std::forward(args)...} {}': 'ObjectHolder(Args&&... args) : value_({std::forward(args)...}) {}', + 'ObjectHolder(Args&&... args) : T{std::forward(args)...} {}': 'ObjectHolder(Args&&... args) : T({std::forward(args)...}) {}', + ], + beginToken: '', + endToken: '') + } + into "$thirdPartyNdkDir/folly" } diff --git a/ReactAndroid/src/main/jni/third-party/jsc/jni/arm64-v8a/libjsc.so b/ReactAndroid/src/main/jni/third-party/jsc/jni/arm64-v8a/libjsc.so new file mode 100644 index 00000000000..a63d7053e71 Binary files /dev/null and b/ReactAndroid/src/main/jni/third-party/jsc/jni/arm64-v8a/libjsc.so differ diff --git a/ReactAndroid/src/main/jni/third-party/jsc/jni/x86_64/libjsc.so b/ReactAndroid/src/main/jni/third-party/jsc/jni/x86_64/libjsc.so new file mode 100644 index 00000000000..28414362cdf Binary files /dev/null and b/ReactAndroid/src/main/jni/third-party/jsc/jni/x86_64/libjsc.so differ diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so b/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so new file mode 100644 index 00000000000..6a089dfe7f3 Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so differ diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so b/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so new file mode 100644 index 00000000000..e6e8acf7952 Binary files /dev/null and b/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so differ