status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-15 03:56:03 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade folly dependency

Browse Source 
Summary: Folly deprecated the brace initialization for dynamic::array, so point to a more recent tarball and fix it.

Reviewed By: bestander

Differential Revision: D3066402

fb-gh-sync-id: aaf70423886cb0cbc14aba7878a1d4e32bce82b1
shipit-source-id: aaf70423886cb0cbc14aba7878a1d4e32bce82b1
This commit is contained in:
Michael Lee 2016-03-18 10:33:19 -07:00 committed by Facebook Github Bot 9
parent e50271cbe3
commit e4eb84fa70
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ReactAndroid/build.gradle
View File

@ -55,17 +55,17 @@ task prepareDoubleConversion(dependsOn: downloadDoubleConversion, type: Copy) {
} }
task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) { task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) {
src 'https://github.com/facebook/folly/archive/v0.50.0.tar.gz' src 'https://github.com/facebook/folly/archive/deprecate-dynamic-initializer.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false overwrite false
dest new File(downloadsDir, 'folly-0.50.0.tar.gz'); dest new File(downloadsDir, 'folly-deprecate-dynamic-initializer.tar.gz');
} }
task prepareFolly(dependsOn: downloadFolly, type: Copy) { task prepareFolly(dependsOn: downloadFolly, type: Copy) {
from tarTree(downloadFolly.dest) from tarTree(downloadFolly.dest)
from 'src/main/jni/third-party/folly/Android.mk' from 'src/main/jni/third-party/folly/Android.mk'
include 'folly-0.50.0/folly/**/*', 'Android.mk' include 'folly-deprecate-dynamic-initializer/folly/**/*', 'Android.mk'
eachFile {fname -> fname.path = (fname.path - "folly-0.50.0/")} eachFile {fname -> fname.path = (fname.path - "folly-deprecate-dynamic-initializer/")}
includeEmptyDirs = false includeEmptyDirs = false
into "$thirdPartyNdkDir/folly" into "$thirdPartyNdkDir/folly"
} }

1
ReactAndroid/src/main/jni/react/jni/BUCK
View File

@ -70,7 +70,6 @@ jni_library(
compiler_flags = [ compiler_flags = [
'-Wall', '-Wall',
'-Werror', '-Werror',
'-Wno-deprecated-declarations',
'-fexceptions', '-fexceptions',
'-std=c++11', '-std=c++11',
'-fvisibility=hidden', '-fvisibility=hidden',

2
ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
View File

@ -235,7 +235,7 @@ struct WritableNativeArray
static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/WritableNativeArray;"; static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/WritableNativeArray;";
WritableNativeArray() WritableNativeArray()
: HybridBase(folly::dynamic({})) {} : HybridBase(folly::dynamic::array()) {}
static local_ref<jhybriddata> initHybrid(alias_ref<jclass>) { static local_ref<jhybriddata> initHybrid(alias_ref<jclass>) {
return makeCxxInstance(); return makeCxxInstance();