File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -30,6 +30,11 @@ allprojects {
3030
3131apply plugin : ' com.android.library'
3232
33+ ext {
34+ firebaseAndroidStl = System . getenv(' FIREBASE_ANDROID_STL' )
35+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ' '
36+ }
37+
3338android {
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 {
8086dependencies {
8187 implementation project(' :app' )
8288}
89+ apply from : " $rootDir /android_build_files/android_abis.gradle"
8390apply from : " $rootDir /android_build_files/generate_proguard.gradle"
8491project. afterEvaluate {
8592 generateProguardFile(' installations' )
Original file line number Diff line number Diff 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.
You can’t perform that action at this time.
0 commit comments