From 86c195b3d8e93bcd0c434aba0ce29ba96df300da Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Fri, 30 Sep 2016 15:27:05 -0700 Subject: [PATCH] Upgrade OSS folly dependency Reviewed By: bestander Differential Revision: D3952605 fbshipit-source-id: 70146987c07b3c9917d19d7fbf844242343f9777 --- ReactAndroid/build.gradle | 8 ++++---- ReactAndroid/src/main/jni/third-party/folly/Android.mk | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 8a9abb5ec..bd9e1c23d 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -60,17 +60,17 @@ task prepareDoubleConversion(dependsOn: downloadDoubleConversion, type: Copy) { } task downloadFolly(dependsOn: createNativeDepsDirectories, type: Download) { - src 'https://github.com/facebook/folly/archive/deprecate-dynamic-initializer.tar.gz' + src 'https://github.com/facebook/folly/archive/v2016.09.26.00.tar.gz' onlyIfNewer true overwrite false - dest new File(downloadsDir, 'folly-deprecate-dynamic-initializer.tar.gz'); + dest new File(downloadsDir, 'folly-2016.09.26.00.tar.gz'); } task prepareFolly(dependsOn: downloadFolly, type: Copy) { from tarTree(downloadFolly.dest) from 'src/main/jni/third-party/folly/Android.mk' - include 'folly-deprecate-dynamic-initializer/folly/**/*', 'Android.mk' - eachFile {fname -> fname.path = (fname.path - "folly-deprecate-dynamic-initializer/")} + include 'folly-2016.09.26.00/folly/**/*', 'Android.mk' + eachFile {fname -> fname.path = (fname.path - "folly-2016.09.26.00/")} includeEmptyDirs = false into "$thirdPartyNdkDir/folly" } diff --git a/ReactAndroid/src/main/jni/third-party/folly/Android.mk b/ReactAndroid/src/main/jni/third-party/folly/Android.mk index dd3a3af80..5692613c8 100644 --- a/ReactAndroid/src/main/jni/third-party/folly/Android.mk +++ b/ReactAndroid/src/main/jni/third-party/folly/Android.mk @@ -6,7 +6,6 @@ LOCAL_SRC_FILES:= \ folly/Unicode.cpp \ folly/Conv.cpp \ folly/Demangle.cpp \ - folly/detail/FunctionalExcept.cpp \ folly/detail/MallocImpl.cpp \ folly/StringBase.cpp \ folly/dynamic.cpp \