jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Flipper to use latest Folly (#356)

Browse Source 
Summary:
Updates Flipper to use latest Folly version
Pull Request resolved: https://github.com/facebook/flipper/pull/356

Reviewed By: passy

Differential Revision: D13718181

Pulled By: priteshrnandgaonkar

fbshipit-source-id: 13a7c2ef37e24295d442fb787f0d5bec0d5e75c6
This commit is contained in:
Pritesh Nandgaonkar
2019-01-21 05:48:37 -08:00
committed by Facebook Github Bot
parent 718403893e
commit 64efeef70b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/FlipperKit.podspec
View File

@@ -61,7 +61,7 @@ Pod::Spec.new do |spec|
ss.dependency 'FlipperKit/FBCxxUtils' ss.dependency 'FlipperKit/FBCxxUtils'
ss.dependency 'FlipperKit/CppBridge' ss.dependency 'FlipperKit/CppBridge'
ss.dependency 'FlipperKit/FKPortForwarding' ss.dependency 'FlipperKit/FKPortForwarding'
ss.dependency 'Folly', '~>1.1' ss.dependency 'Folly', '~>1.2'
ss.dependency 'Flipper', '~>'+flipperkit_version ss.dependency 'Flipper', '~>'+flipperkit_version
ss.dependency 'OpenSSL-Static', '1.0.2.c1' ss.dependency 'OpenSSL-Static', '1.0.2.c1'
ss.compiler_flags = folly_compiler_flags ss.compiler_flags = folly_compiler_flags

2
xplat/Flipper/Flipper.podspec
View File

@@ -12,7 +12,7 @@ Pod::Spec.new do |spec|
spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h' spec.public_header_files = 'xplat/Flipper/*.h','xplat/utils/*.h'
spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}' spec.source_files = 'xplat/Flipper/*.{h,cpp,m,mm}','xplat/Flipper/utils/*.{h,cpp,m,mm}'
spec.libraries = "stdc++" spec.libraries = "stdc++"
spec.dependency 'Folly', '~>1.1' spec.dependency 'Folly', '~>1.2'
spec.dependency 'RSocket', '~>0.10' spec.dependency 'RSocket', '~>0.10'
spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0 -Wall spec.compiler_flags = '-DFLIPPER_OSS=1 -DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0 -Wall
-std=c++14 -std=c++14