jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade folly to v2020.02.17.00 (#809)

Browse Source 
Summary:
# Summary

Folly became once again incompatible with the Android NDK, which caused our CI to fail to produce sample APK builds on release. I managed to repro this on my machine and it's working again now.

Sadly, I had to patch another file manually because something about the template parameter inference wasn't working ...

# Notes

This was done by first bumping the version, then going through the compiler errors and simply removing the lines that the C++ compiler in the NDK had trouble inferring the types for. We were lucky in that the exported symbols this affected weren't actually used, so I copied over the file to `overrides/Folly/` and set up another copy rule in Gradle.

# Meta

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

Test Plan:
```
./gradlew :sample:assembleDebug
```

Internal, external CI.

Reviewed By: mweststrate

Differential Revision: D19948797

Pulled By: passy

fbshipit-source-id: b2e98d3a5c89b0fc77c157683cde90997232fee0
This commit is contained in:
Pascal Hartig
2020-02-19 05:03:20 -08:00
committed by Facebook Github Bot
parent a0cd6e3adb
commit 47471d2def
4 changed files with 281 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/third-party/native.gradle vendored
View File

@@ -11,7 +11,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
// Increment this when making changes to any of the native
// dependencies.
// !!!
final def CACHE_REVISION = 29
final def CACHE_REVISION = 30
final def externalDir = new File("$projectDir/external")
final def downloadsDir = new File("$externalDir/downloads")
@@ -117,7 +117,7 @@ task prepareBoost(dependsOn: [downloadBoost], type: Copy) {
}
task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
src 'https://github.com/facebook/folly/archive/v2019.09.02.00.tar.gz'
src 'https://github.com/facebook/folly/archive/v2020.02.17.00.tar.gz'
onlyIfNewer true
overwrite false
dest new File(downloadsDir, 'folly-' + getDownloadFileName(src))
@@ -127,8 +127,8 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
onlyIf { isCacheOutOfDate(CACHE_REVISION) }
from tarTree(downloadFolly.dest)
from './overrides/Folly/'
include 'folly-2019.09.02.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
eachFile { it.path = it.path - "folly-2019.09.02.00/" }
include 'folly-2020.02.17.00/folly/**/*', 'build.gradle', 'CMakeLists.txt', 'ApplicationManifest.xml'
eachFile { it.path = it.path - "folly-2020.02.17.00/" }
includeEmptyDirs = false
into "$externalDir/folly/"
}
@@ -140,11 +140,14 @@ task finalizeFollyWithDemangle(dependsOn: [prepareFolly], type: Copy) {
into "$externalDir/folly/folly/detail/"
}
//TODO: Get rid off this hack.
task finalizeFolly(dependsOn: [finalizeFollyWithDemangle], type: Copy) {
// HACK to fix template issue with newest NDK
task finalizeFollyWithFileUtil(dependsOn: [prepareFolly], type: Copy) {
from './overrides/Folly/'
include 'AsyncServerSocket.cpp'
into "$externalDir/folly/folly/io/async/"
include 'FileUtil.cpp'
into "$externalDir/folly/folly/"
}
task finalizeFolly(dependsOn: [finalizeFollyWithDemangle, finalizeFollyWithFileUtil]) {
}
task downloadLibEvent(dependsOn: [], type: Download) {