From 98d8f6cb0407705347a353f57d9081e3bf722a84 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Fri, 29 Jan 2021 16:43:20 -0800
Subject: [PATCH] Fix a linker issue with FIS on Android where the wrong STL
 was specified.

---
 installations/build.gradle    | 9 ++++++++-
 release_build_files/readme.md | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/installations/build.gradle b/installations/build.gradle
index 9a8109c23..e4552aadd 100644
--- a/installations/build.gradle
+++ b/installations/build.gradle
@@ -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'
@@ -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}"
       }
     }
   }
@@ -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')
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index 1078b0b1b..1d74d1bc8 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -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.