Skip to content

Commit e478163

Browse files
authored
Fix a linker issue with FIS on Android where the wrong STL was specified. (#265)
1 parent 66be026 commit e478163

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

installations/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ allprojects {
3030

3131
apply plugin: 'com.android.library'
3232

33+
ext {
34+
firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
35+
firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
36+
}
37+
3338
android {
3439
compileSdkVersion 28
3540
buildToolsVersion '28.0.3'
@@ -67,7 +72,8 @@ android {
6772
// Only include needed project.
6873
arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
6974
'-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
70-
'-DFIREBASE_INCLUDE_INSTALLATIONS=ON'
75+
'-DFIREBASE_INCLUDE_INSTALLATIONS=ON',
76+
"-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
7177
}
7278
}
7379
}
@@ -80,6 +86,7 @@ android {
8086
dependencies {
8187
implementation project(':app')
8288
}
89+
apply from: "$rootDir/android_build_files/android_abis.gradle"
8390
apply from: "$rootDir/android_build_files/generate_proguard.gradle"
8491
project.afterEvaluate {
8592
generateProguardFile('installations')

release_build_files/readme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,11 @@ code.
559559

560560
## Release Notes
561561

562+
### 7.0.1
563+
- Changes
564+
- Installations (Android): Fix incorrect STL variants, which fixes
565+
a linker error on Android.
566+
562567
### 7.0.0
563568
- Changes
564569
- General (iOS): iOS SDKs are now built using Xcode 11.7.

0 commit comments

Comments
 (0)