Skip to content

Commit 64d50a7

Browse files
authored
Don't use Abseil exceptions checks on Android (#7612)
This is a port of CL 354562822. Original description: "It seems as if policy checks in Abseil fail on Android even when compiling against non-STLPort C++ runtimes." #no-changelog
1 parent 885ddd9 commit 64d50a7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Firestore/core/src/util/firestore_exceptions.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "Firestore/core/include/firebase/firestore/firestore_errors.h"
2929

30-
#if defined(_STLPORT_VERSION)
30+
#if defined(__ANDROID__)
3131
// Abseil does not support STLPort, so avoid their config.h here.
3232
//
3333
// TODO(b/163140650): Remove once the Firebase support floor moves to NDK R18.
@@ -39,14 +39,14 @@
3939
#define FIRESTORE_HAVE_EXCEPTIONS 1
4040
#endif
4141

42-
#else // !defined(_STLPORT_VERSION)
42+
#else // !defined(__ANDROID__)
4343
// On any other supported platform, just take Abseil's word for it.
4444
#include "absl/base/config.h"
4545

4646
#if ABSL_HAVE_EXCEPTIONS
4747
#define FIRESTORE_HAVE_EXCEPTIONS 1
4848
#endif
49-
#endif // defined(_STLPORT_VERSION)
49+
#endif // defined(__ANDROID__)
5050

5151
namespace firebase {
5252
namespace firestore {

0 commit comments

Comments
 (0)