From 8aca08bb0de0e9060465a8014ba1c5bd80d62c55 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Mon, 21 Dec 2015 20:07:30 -0800
Subject: [PATCH] Bug 1220500 - Set ANDROID_PACKAGE_NAME correctly from
 MOZ_APP_NAME. r=glandium

---
 configure.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 583ce8384fd..bd7fe2e81fc 100644
--- a/configure.in
+++ b/configure.in
@@ -328,9 +328,6 @@ else
 
     case "$target" in
     *-android*|*-linuxandroid*)
-        if test -z "$ANDROID_PACKAGE_NAME" ; then
-            ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
-        fi
         MOZ_CHROME_FILE_FORMAT=omni
         ZLIB_DIR=yes
         AC_DEFINE(ANDROID)
@@ -8664,6 +8661,10 @@ if test -z "$MOZ_APP_VERSION_DISPLAY"; then
    MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION
 fi
 
+if test -z "$ANDROID_PACKAGE_NAME" ; then
+   ANDROID_PACKAGE_NAME="org.mozilla.$MOZ_APP_NAME"
+fi
+
 # For extensions and langpacks, we require a max version that is compatible
 # across security releases. MOZ_APP_MAXVERSION is our method for doing that.
 # 24.0a1 and 24.0a2 aren't affected