From 75b10a7b6b37f071943021811dc3fc0cf265f035 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Fri, 2 Feb 2018 11:02:50 -0500
Subject: End FIREFOX_VERSION and use preprocessed values in bundled
 install.rdf files

---
 mobile/android/extensions/flyweb/install.rdf.in | 6 +++---
 mobile/android/extensions/flyweb/moz.build      | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'mobile/android/extensions')

diff --git a/mobile/android/extensions/flyweb/install.rdf.in b/mobile/android/extensions/flyweb/install.rdf.in
index 76430412c..dfa7a4262 100644
--- a/mobile/android/extensions/flyweb/install.rdf.in
+++ b/mobile/android/extensions/flyweb/install.rdf.in
@@ -18,9 +18,9 @@
         with minimum and maximum supported versions. -->
     <em:targetApplication>
       <Description>
-        <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
-        <em:minVersion>@FIREFOX_VERSION@</em:minVersion>
-        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
+        <em:id>@MOZ_APP_ID@</em:id>
+        <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
+        <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
diff --git a/mobile/android/extensions/flyweb/moz.build b/mobile/android/extensions/flyweb/moz.build
index f453297e5..975e109e5 100644
--- a/mobile/android/extensions/flyweb/moz.build
+++ b/mobile/android/extensions/flyweb/moz.build
@@ -4,6 +4,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+DEFINES['MOZ_APP_ID'] = CONFIG['MOZ_APP_ID']
+
 FINAL_TARGET_FILES.features['flyweb@mozilla.org'] += [
   'bootstrap.js'
 ]
-- 
cgit v1.2.3