status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade OSS folly dependency 

Reviewed By: bestander

Differential Revision: D3952605

fbshipit-source-id: 70146987c07b3c9917d19d7fbf844242343f9777
This commit is contained in:
Pieter De Baets 2016-09-30 15:27:05 -07:00 committed by Facebook Github Bot
parent 5a24ea0b42
commit 86c195b3d8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ReactAndroid/build.gradle
View File

@ -60,17 +60,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/deprecate-dynamic-initializer.tar.gz' src 'https://github.com/facebook/folly/archive/v2016.09.26.00.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false 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) { 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-deprecate-dynamic-initializer/folly/**/*', 'Android.mk' include 'folly-2016.09.26.00/folly/**/*', 'Android.mk'
eachFile {fname -> fname.path = (fname.path - "folly-deprecate-dynamic-initializer/")} eachFile {fname -> fname.path = (fname.path - "folly-2016.09.26.00/")}
includeEmptyDirs = false includeEmptyDirs = false
into "$thirdPartyNdkDir/folly" into "$thirdPartyNdkDir/folly"
} }

1
ReactAndroid/src/main/jni/third-party/folly/Android.mk vendored
View File

@ -6,7 +6,6 @@ LOCAL_SRC_FILES:= \
folly/Unicode.cpp \ folly/Unicode.cpp \
folly/Conv.cpp \ folly/Conv.cpp \
folly/Demangle.cpp \ folly/Demangle.cpp \
folly/detail/FunctionalExcept.cpp \
folly/detail/MallocImpl.cpp \ folly/detail/MallocImpl.cpp \
folly/StringBase.cpp \ folly/StringBase.cpp \
folly/dynamic.cpp \ folly/dynamic.cpp \