File tree 2 files changed +13
-1
lines changed 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -30,6 +30,11 @@ allprojects {
30
30
31
31
apply plugin : ' com.android.library'
32
32
33
+ ext {
34
+ firebaseAndroidStl = System . getenv(' FIREBASE_ANDROID_STL' )
35
+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ' '
36
+ }
37
+
33
38
android {
34
39
compileSdkVersion 28
35
40
buildToolsVersion ' 28.0.3'
@@ -67,7 +72,8 @@ android {
67
72
// Only include needed project.
68
73
arguments ' -DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON' ,
69
74
' -DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF' ,
70
- ' -DFIREBASE_INCLUDE_INSTALLATIONS=ON'
75
+ ' -DFIREBASE_INCLUDE_INSTALLATIONS=ON' ,
76
+ " -DFIREBASE_ANDROID_STL=${ firebaseAndroidStl} "
71
77
}
72
78
}
73
79
}
@@ -80,6 +86,7 @@ android {
80
86
dependencies {
81
87
implementation project(' :app' )
82
88
}
89
+ apply from : " $rootDir /android_build_files/android_abis.gradle"
83
90
apply from : " $rootDir /android_build_files/generate_proguard.gradle"
84
91
project. afterEvaluate {
85
92
generateProguardFile(' installations' )
Original file line number Diff line number Diff line change @@ -559,6 +559,11 @@ code.
559
559
560
560
## Release Notes
561
561
562
+ ### 7.0.1
563
+ - Changes
564
+ - Installations (Android): Fix incorrect STL variants, which fixes
565
+ a linker error on Android.
566
+
562
567
### 7.0.0
563
568
- Changes
564
569
- General (iOS): iOS SDKs are now built using Xcode 11.7.
You can’t perform that action at this time.
0 commit comments