Upgrade OSS folly dependency
Reviewed By: bestander Differential Revision: D3952605 fbshipit-source-id: 70146987c07b3c9917d19d7fbf844242343f9777
This commit is contained in:
parent
5a24ea0b42
commit
86c195b3d8
|
@ -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"
|
||||
}
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue