From 4fd54506f8d807e3c549388626f947af5c969229 Mon Sep 17 00:00:00 2001
From: Mike Taylor <miket@mozilla.com>
Date: Wed, 13 Jul 2016 12:32:54 -0400
Subject: [PATCH] Bug 1285211. Enable "Report Site Issue" menu item in Aurora +
 Nightly. r=sebastian

---
 mobile/android/chrome/content/browser.js | 4 ++--
 mobile/android/chrome/jar.mn             | 2 +-
 mobile/android/locales/jar.mn            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 19eeb8c48cc9..bc59135041ca 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -133,7 +133,7 @@ var lazilyLoadedBrowserScripts = [
   ["CastingApps", "chrome://browser/content/CastingApps.js"],
   ["RemoteDebugger", "chrome://browser/content/RemoteDebugger.js"],
 ];
-if (AppConstants.NIGHTLY_BUILD) {
+if (!AppConstants.RELEASE_BUILD) {
   lazilyLoadedBrowserScripts.push(
     ["WebcompatReporter", "chrome://browser/content/WebcompatReporter.js"]);
 }
@@ -531,7 +531,7 @@ var BrowserApp = {
       InitLater(() => Services.obs.notifyObservers(window, "browser-delayed-startup-finished", ""));
       InitLater(() => Messaging.sendRequest({ type: "Gecko:DelayedStartup" }));
 
-      if (AppConstants.NIGHTLY_BUILD) {
+      if (!AppConstants.RELEASE_BUILD) {
         InitLater(() => WebcompatReporter.init());
       }
 
diff --git a/mobile/android/chrome/jar.mn b/mobile/android/chrome/jar.mn
index f74aa4c03eb9..3fab151e60f0 100644
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -59,7 +59,7 @@ chrome.jar:
   content/aboutAccounts.js             (content/aboutAccounts.js)
   content/aboutLogins.xhtml            (content/aboutLogins.xhtml)
   content/aboutLogins.js               (content/aboutLogins.js)
-#ifdef NIGHTLY_BUILD
+#ifndef RELEASE_BUILD
   content/WebcompatReporter.js         (content/WebcompatReporter.js)
 #endif
 
diff --git a/mobile/android/locales/jar.mn b/mobile/android/locales/jar.mn
index 892c90e1d527..37b504a22804 100644
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -36,7 +36,7 @@
   locale/@AB_CD@/browser/handling.properties      (%chrome/handling.properties)
   locale/@AB_CD@/browser/aboutLogins.dtd          (%chrome/aboutLogins.dtd)
   locale/@AB_CD@/browser/aboutLogins.properties  (%chrome/aboutLogins.properties)
-#ifdef NIGHTLY_BUILD
+#ifndef RELEASE_BUILD
   locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
 #endif
 % resource search-plugins chrome://browser/locale/searchplugins/