Upgrade folly (#533)

Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/533

Bumping to the most recent version.

Reviewed By: jknoxville

Differential Revision: D17161724

fbshipit-source-id: 26bf94d83f5b9d31ef755b4bb0b36c18c4184696
This commit is contained in:
Pascal Hartig
2019-09-04 04:42:56 -07:00
committed by Facebook Github Bot
parent 6eb1531aae
commit 3dfd9a92e4

View File

@@ -11,7 +11,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
// Increment this when making changes to any of the native // Increment this when making changes to any of the native
// dependencies. // dependencies.
// !!! // !!!
final def CACHE_REVISION = 27 final def CACHE_REVISION = 28
final def externalDir = new File("$projectDir/external") final def externalDir = new File("$projectDir/external")
final def downloadsDir = new File("$externalDir/downloads") final def downloadsDir = new File("$externalDir/downloads")
@@ -117,7 +117,7 @@ task prepareBoost(dependsOn: [downloadBoost], type: Copy) {
} }
task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) { task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
src 'https://github.com/facebook/folly/archive/v2019.06.10.00.tar.gz' src 'https://github.com/facebook/folly/archive/v2019.09.02.00.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false overwrite false
dest new File(downloadsDir, 'folly-' + getDownloadFileName(src)) dest new File(downloadsDir, 'folly-' + getDownloadFileName(src))
@@ -127,8 +127,8 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
onlyIf { isCacheOutOfDate(CACHE_REVISION) } onlyIf { isCacheOutOfDate(CACHE_REVISION) }
from tarTree(downloadFolly.dest) from tarTree(downloadFolly.dest)
from './overrides/Folly/' from './overrides/Folly/'
include 'folly-2019.06.10.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml' include 'folly-2019.09.02.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
eachFile { it.path = it.path - "folly-2019.06.10.00/" } eachFile { it.path = it.path - "folly-2019.09.02.00/" }
includeEmptyDirs = false includeEmptyDirs = false
into "$externalDir/folly/" into "$externalDir/folly/"
} }