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

Cleanup Flipper-Folly.podspec included headers (#518)

Browse Source 
Summary:
- This removes `folly/**/*.h` in `source_files` which causes all headers to be included. Instead we include only the headers needed to build. In my case this caused a conflict with folly's "Zlib.h" getting included instead of the system "zlib.h" (apparently paths are not case sensitive).
- Remove duplicates in `public_header_files`, we can just keep `"folly/**/*.h"` to make all headers public.
- Remove `preserve_paths`, this is not be needed anymore.

## Changelog

Cleanup Flipper-Folly.podspec included headers
Pull Request resolved: https://github.com/facebook/flipper/pull/518

Test Plan: Tested in an app that everything build using the modified podspec.

Reviewed By: jknoxville

Differential Revision: D16918216

Pulled By: priteshrnandgaonkar

fbshipit-source-id: 81cc9891c67bcb019580eb21d1b8e6d7318a4e03
This commit is contained in:
Janic Duplessis
2019-11-12 09:50:54 -08:00
committed by Facebook Github Bot
parent 22a86747d4
commit ef06f6d546
1 changed files with 45 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
iOS/Podspecs/Flipper-Folly.podspec
View File

@@ -29,133 +29,63 @@ Pod::Spec.new do |spec|
-Wno-comment -Wno-comment
-Wno-return-type -Wno-return-type
-Wno-global-constructors' -Wno-global-constructors'
spec.source_files = "folly/system/*.cpp", spec.source_files = "folly/*.h",
"folly/portability/Config.h", "folly/concurrency/*.h",
"folly/Executor.h", "folly/container/*.h",
"folly/Function.h", "folly/container/detail/*.h",
"folly/Utility.h", "folly/detail/*.h",
"folly/Portability.h", "folly/executors/**/*.h",
"folly/Traits.h", "folly/experimental/*.h",
"folly/functional/Invoke.h", "folly/functional/*.h",
"folly/CPortability.h",
"folly/dynamic.h",
"folly/json_pointer.h",
"folly/Expected.h",
"folly/Preprocessor.h",
"folly/Optional.h",
"folly/Unit.h",
"folly/Utility.h",
"folly/lang/ColdClass.h",
"folly/CppAttributes.h",
"folly/json.h",
"folly/Range.h",
"folly/hash/SpookyHashV2.h",
"folly/lang/Exception.h",
"folly/portability/Constexpr.h",
"folly/CpuId.h",
"folly/Likely.h",
"folly/detail/RangeCommon.h",
"folly/detail/RangeSse42.h",
"folly/portability/String.h",
"folly/dynamic-inl.h",
"folly/Conv.h",
"folly/Demangle.h",
"folly/FBString.h",
"folly/hash/Hash.h",
"folly/memory/Malloc.h",
"folly/io/async/AsyncTimeout.h",
"folly/**/*.h",
"folly/memory/detail/MallocImpl.h",
"folly/String.h",
"folly/*.h",
"folly/portability/PThread.h",
"folly/futures/*.h", "folly/futures/*.h",
"folly/futures/detail/*.h", "folly/futures/detail/*.h",
"folly/Executor.cpp", "folly/gen/*.h",
"folly/memory/detail/MallocImpl.cpp", "folly/hash/*.h",
"folly/String.cpp", "folly/hash/detail/*.h",
"folly/init/*.h",
"folly/io/*.h",
"folly/io/async/*.h",
"folly/io/async/ssl/*.h",
"folly/lang/*.h",
"folly/memory/*.h",
"folly/memory/detail/*.h",
"folly/net/*.h",
"folly/net/detail/*.h",
"folly/portability/*.h",
"folly/ssl/*.h",
"folly/ssl/detail/*.h",
"folly/synchronization/*.h",
"folly/synchronization/detail/*.h",
"folly/system/*.h",
"folly/tracing/*.h",
"folly/*.cpp", "folly/*.cpp",
"folly/net/*.cpp", "folly/concurrency/*.cpp",
"folly/container/detail/*.cpp",
"folly/detail/*.cpp", "folly/detail/*.cpp",
"folly/hash/*.cpp", "folly/executors/*.cpp",
"folly/portability/*.cpp", "folly/experimental/hazptr/*.cpp",
"folly/ScopeGuard.h",
"folly/lang/ColdClass.cpp",
"folly/lang/Assume.h",
"folly/lang/Assume.cpp",
"folly/io/async/*.cpp",
"folly/io/async/ssl/*.cpp",
"folly/io/*.cpp",
"folly/synchronization/*.cpp",
"folly/lang/*.cpp",
"folly/memory/*.cpp",
"folly/futures/*.cpp", "folly/futures/*.cpp",
"folly/futures/detail/*.cpp", "folly/futures/detail/*.cpp",
"folly/experimental/hazptr/*.cpp", "folly/hash/*.cpp",
"folly/executors/*.cpp", "folly/io/*.cpp",
"folly/concurrency/*.cpp", "folly/io/async/*.cpp",
"folly/io/async/ssl/*.cpp",
"folly/lang/*.cpp",
"folly/memory/*.cpp",
"folly/memory/detail/*.cpp",
"folly/net/*.cpp",
"folly/portability/*.cpp",
"folly/ssl/*.cpp", "folly/ssl/*.cpp",
"folly/ssl/detail/*.cpp", "folly/ssl/detail/*.cpp",
"folly/container/detail/*.cpp" "folly/String.cpp",
# workaround for https://github.com/facebook/react-native/issues/14326 "folly/synchronization/*.cpp",
spec.preserve_paths = 'folly/*.h', "folly/system/*.cpp"
'folly/portability/*.h',
'folly/lang/*.h',
'folly/functional/*.h',
'folly/detail/*.h',
'folly/hash/*.h',
'folly/memory/*.h',
'folly/**/*.h',
'folly/futures/detail/*.h',
'folly/futures/*.h'
spec.header_mappings_dir = 'folly' spec.header_mappings_dir = 'folly'
spec.header_dir = 'folly' spec.header_dir = 'folly'
spec.libraries = "stdc++" spec.libraries = "stdc++"
spec.private_header_files = "folly/portability/Stdlib.h",
"folly/portability/Stdio.h"
spec.public_header_files = "folly/portability/Config.h", spec.public_header_files = "folly/**/*.h"
"folly/Executor.h",
"folly/Function.h",
"folly/Utility.h",
"folly/Portability.h",
"folly/Traits.h",
"folly/functional/Invoke.h",
"folly/CPortability.h",
"folly/dynamic.h",
"folly/json_pointer.h",
"folly/Expected.h",
"folly/Preprocessor.h",
"folly/Optional.h",
"folly/Unit.h",
"folly/Utility.h",
"folly/lang/ColdClass.h",
"folly/CppAttributes.h",
"folly/json.h",
"folly/Range.h",
"folly/hash/SpookyHashV2.h",
"folly/lang/Exception.h",
"folly/portability/Constexpr.h",
"folly/CpuId.h",
"folly/Likely.h",
"folly/detail/RangeCommon.h",
"folly/detail/RangeSse42.h",
"folly/portability/String.h",
"folly/dynamic-inl.h",
"folly/Conv.h",
"folly/Demangle.h",
"folly/FBString.h",
"folly/hash/Hash.h",
"folly/memory/Malloc.h",
"folly/io/async/AsyncTimeout.h",
"folly/**/*.h",
"folly/memory/detail/MallocImpl.h",
"folly/String.h",
"folly/*.h",
"folly/portability/PThread.h",
"folly/futures/*.h",
"folly/futures/detail/*.h"
spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
"ARCHS" => "${ARCHS_STANDARD_64_BIT}", "ARCHS" => "${ARCHS_STANDARD_64_BIT}",