Skip to content
This repository has been archived by the owner on Feb 18, 2019. It is now read-only.

Commit

Permalink
Upgrade folly dependency
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mzlee authored and Facebook Github Bot 9 committed Mar 18, 2016
1 parent e50271c commit e4eb84f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ task prepareDoubleConversion(dependsOn: downloadDoubleConversion, type: Copy) {
}

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
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) {
from tarTree(downloadFolly.dest)
from 'src/main/jni/third-party/folly/Android.mk'
include 'folly-0.50.0/folly/**/*', 'Android.mk'
eachFile {fname -> fname.path = (fname.path - "folly-0.50.0/")}
include 'folly-deprecate-dynamic-initializer/folly/**/*', 'Android.mk'
eachFile {fname -> fname.path = (fname.path - "folly-deprecate-dynamic-initializer/")}
includeEmptyDirs = false
into "$thirdPartyNdkDir/folly"
}
Expand Down
1 change: 0 additions & 1 deletion ReactAndroid/src/main/jni/react/jni/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ jni_library(
compiler_flags = [
'-Wall',
'-Werror',
'-Wno-deprecated-declarations',
'-fexceptions',
'-std=c++11',
'-fvisibility=hidden',
Expand Down
2 changes: 1 addition & 1 deletion ReactAndroid/src/main/jni/react/jni/OnLoad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ struct WritableNativeArray
static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/WritableNativeArray;";

WritableNativeArray()
: HybridBase(folly::dynamic({})) {}
: HybridBase(folly::dynamic::array()) {}

static local_ref<jhybriddata> initHybrid(alias_ref<jclass>) {
return makeCxxInstance();
Expand Down

0 comments on commit e4eb84f

Please sign in to comment.