Bug 1220500 - Set ANDROID_PACKAGE_NAME correctly from MOZ_APP_NAME. r=glandium

This commit is contained in:
Nick Alexander 2015-12-21 20:07:30 -08:00
parent 1bb1ca8702
commit 8aca08bb0d

View File

@ -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