Skip to content

Commit ddf7829

Browse files
committed
Merge branch 'wilhuff/merge'
2 parents 319a8be + 7e3786b commit ddf7829

File tree

490 files changed

+14035
-6356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

490 files changed

+14035
-6356
lines changed

FirebaseFirestore.podspec

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,19 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
103103
'Firestore/third_party/abseil-cpp/**/*test*.cc',
104104
'Firestore/third_party/abseil-cpp/absl/hash/internal/print_hash_of.cc',
105105

106+
# Exclude CMake-related everything, including tests
107+
'Firestore/third_party/abseil-cpp/CMake/**/*.cc',
108+
106109
# Avoid the debugging package which uses code that isn't portable to
107110
# ARM (see stack_consumption.cc) and uses syscalls not available on
108111
# tvOS (e.g. sigaltstack).
109112
'Firestore/third_party/abseil-cpp/absl/debugging/**/*.cc',
110113

114+
# Dropping the debugging package prevents downstream usage of this in the
115+
# abseil sources.
116+
'Firestore/third_party/abseil-cpp/absl/container/internal/hashtable_debug*',
117+
'Firestore/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler*',
118+
111119
# Exclude the synchronization package because it's dead weight: we don't
112120
# write the kind of heavily threaded code that might benefit from it.
113121
'Firestore/third_party/abseil-cpp/absl/synchronization/**/*.cc',
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: Google
4+
...

0 commit comments

Comments
 (0)