evert "Remove unused files and code for old JSC and gcc build (#23014)"

This reverts commit bbf439862c.
2025-11-01 09:14:26 +00:00 · 2019-01-17 10:53:19 +01:00
parent 4ff693b93b
commit fb4e4fd099
5 changed files with 11 additions and 0 deletions
@@ -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"
 }