evert "Remove unused files and code for old JSC and gcc build (facebo…

…ok#23014)" This reverts commit bbf4398.
microsoft · Jan 17, 2019 · d99ba92 · d99ba92
1 parent f0accce
commit d99ba92
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git 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>(args)...} {}': 'ObjectHolder(Args&&... args) : value_({std::forward<Args>(args)...}) {}',
+            'ObjectHolder(Args&&... args) : T{std::forward<Args>(args)...} {}': 'ObjectHolder(Args&&... args) : T({std::forward<Args>(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
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
diff --git a/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so b/ReactAndroid/src/main/jniLibs/arm64-v8a/libicu_common.so
diff --git a/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so b/ReactAndroid/src/main/jniLibs/x86_64/libicu_common.so