Skip to content

Commit de923c2

Browse files
authored
Remove support for STLPort and deprecate support for gnustl on Android
2 parents b986207 + 95a69f6 commit de923c2

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

app/src/include/firebase/app.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ namespace internal {
5555
class AppInternal;
5656
} // namespace internal
5757

58-
#ifdef _STLPORT_VERSION
59-
#warning "Firebase support for STLPort is deprecated and will be removed in \
60-
the next major release. Please use libc++ instead."
58+
#if FIREBASE_PLATFORM_ANDROID && defined(__GLIBCXX__)
59+
#warning "Firebase support for gnustl is deprecated and will be removed in \
60+
the next major release. Please use libc++ instead."
6161
#endif
6262
6363
/// @brief Reports whether a Firebase module initialized successfully.

build_scripts/android/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sourcepath=$2
55
stl=$3
66

77
if [[ -z "${buildpath}" || -z "${sourcepath}" ]]; then
8-
echo "Usage: $0 <build path> <source path> [c++|gnustl|stlport]"
8+
echo "Usage: $0 <build path> <source path> [c++|gnustl]"
99
exit 1
1010
fi
1111

@@ -14,11 +14,11 @@ if [[ ! -d "${sourcepath}" ]]; then
1414
exit 2
1515
fi
1616

17-
if [[ "${stl}" == "c++" || "${stl}" == "gnustl" || "${stl}" == "stlport" ]]; then
17+
if [[ "${stl}" == "c++" || "${stl}" == "gnustl" ]]; then
1818
export FIREBASE_ANDROID_STL="${stl}"_static
1919
elif [[ ! -z "${stl}" ]]; then
2020
echo "Invalid STL specified."
21-
echo "Valid STLs are: 'c++' (default), 'gnustl', or 'stlport'"
21+
echo "Valid STLs are: 'c++' (default) or 'gnustl'"
2222
exit 2
2323
fi
2424

build_scripts/android/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22

3-
readonly -a allowed_stl_variants=("c++" "gnustl" "stlport")
3+
readonly -a allowed_stl_variants=("c++" "gnustl")
44
builtpath=$1
55
packagepath=$2
66
stl=$3

build_scripts/desktop/get_variant.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ for c in $(echo "${filename}" | tr "[:upper:]" "[:lower:]" | tr "_.-" "\n\n\n");
125125
gnustl)
126126
stl=gnustl
127127
;;
128-
stlport)
129-
stl=stlport
130-
;;
131128
cxx11)
132129
linux_abi=cxx11
133130
;;

release_build_files/readme.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,12 @@ code.
363363
## Release Notes
364364

365365
### 8.0.0
366-
367366
- Changes
367+
- General (Android): Firebase no longer supports STLPort. Please
368+
[use libc++ instead](https://developer.android.com/ndk/guides/cpp-support#cs).
369+
- General (Android): Firebase support for gnustl (also known as libstdc++)
370+
is deprecated and will be removed in the next major release. Please use
371+
libc++ instead.
368372
- Instance Id: Removed support for the previously-deprecated Instance ID SDK.
369373
- Remote Config: The previously-deprecated static methods have been removed.
370374
Please use the new instance-based `firebase::remote_config::RemoteConfig`

0 commit comments

Comments
 (0)