Skip to content

Fix a linker issue with FIS on Android where the wrong STL was specified. #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2021
Merged

Fix a linker issue with FIS on Android where the wrong STL was specified. #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion installations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ allprojects {

apply plugin: 'com.android.library'

ext {
firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
}

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
Expand Down Expand Up @@ -67,7 +72,8 @@ android {
// Only include needed project.
arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
'-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
'-DFIREBASE_INCLUDE_INSTALLATIONS=ON'
'-DFIREBASE_INCLUDE_INSTALLATIONS=ON',
"-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
}
}
}
Expand All @@ -80,6 +86,7 @@ android {
dependencies {
implementation project(':app')
}
apply from: "$rootDir/android_build_files/android_abis.gradle"
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
project.afterEvaluate {
generateProguardFile('installations')
Expand Down
5 changes: 5 additions & 0 deletions release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,11 @@ code.

## Release Notes

### 7.0.1
- Changes
- Installations (Android): Fix incorrect STL variants, which fixes
a linker error on Android.

### 7.0.0
- Changes
- General (iOS): iOS SDKs are now built using Xcode 11.7.
Expand Down