From 3fb22a12b6100e1d17448da8cc415d902e268621 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Mon, 26 Aug 2019 17:02:11 +0200
Subject: [PATCH] Issue #4873: Use manifest placeholder to inject sharedUserId.

---
 app/build.gradle                             | 8 ++++++++
 app/src/fennecProduction/AndroidManifest.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index aeba9bb7f..ecf141fd3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,6 +72,14 @@ android {
         fennecProduction releaseTemplate >> {
             buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
             applicationIdSuffix ".firefox"
+            manifestPlaceholders = [
+                // This release type is meant to replace Firefox (Release channel) and therefore needs to inherit
+                // its sharedUserId for all eternity. Shipping an app update without sharedUserId can have
+                // fatal consequences. For example see:
+                //  - https://issuetracker.google.com/issues/36924841
+                //  - https://issuetracker.google.com/issues/36905922
+                "sharedUserId": "org.mozilla.firefox.sharedID"
+            ]
         }
     }
 
diff --git a/app/src/fennecProduction/AndroidManifest.xml b/app/src/fennecProduction/AndroidManifest.xml
index aaa42eed7..ad6a74698 100644
--- a/app/src/fennecProduction/AndroidManifest.xml
+++ b/app/src/fennecProduction/AndroidManifest.xml
@@ -7,6 +7,6 @@
                 - https://issuetracker.google.com/issues/36905922
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      android:sharedUserId="org.mozilla.firefox.sharedID">
+      android:sharedUserId="${sharedUserId}">
 </manifest>