Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 719560 - Can't publish split native and xul builds under the same product on android market r=mbrubeck

Browse Source
This commit is contained in:
Brad Lassey 2012-01-19 16:52:44 -05:00
parent 02829eb74d
commit 75ebf6e8cc
8 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -460,6 +460,9 @@ case "$target" in
if test -z "$ANDROID_PACKAGE_NAME" ; then
ANDROID_PACKAGE_NAME='org.mozilla.$(MOZ_APP_NAME)'
fi
if test -z "$MOZ_MOBILE_COMPAT" ; then
MOZ_MOBILE_COMPAT='All'
fi
AC_DEFINE(ANDROID)
AC_DEFINE_UNQUOTED(ANDROID_VERSION, $android_version)
@ -481,6 +484,7 @@ AC_SUBST(ANDROID_PLATFORM)
AC_SUBST(ANDROID_SDK)
AC_SUBST(ANDROID_PLATFORM_TOOLS)
AC_SUBST(ANDROID_PACKAGE_NAME)
AC_SUBST(MOZ_MOBILE_COMPAT)
AC_SUBST(OBJCOPY)
dnl ========================================================

8
embedding/android/AndroidManifest.xml.in
View File

@ -9,9 +9,17 @@
android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
#endif
>
<uses-sdk android:minSdkVersion="5"
android:targetSdkVersion="11"/>
#ifdef MOZ_TABLETS_ONLY
<supports-screens android:smallScreens="false"
android:normalScreens="false"
android:largeScreens="false"
android:xlargeScreens="true" />
#endif
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>

8
embedding/android/Makefile.in
View File

@ -79,7 +79,8 @@ MIN_CPU_VERSION=5
endif
ifeq (,$(ANDROID_VERSION_CODE))
ANDROID_VERSION_CODE=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10)
# increment the version code by 1 so xul fennec will win any compatability ties
ANDROID_VERSION_CODE=$(shell echo `$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10` + 1 | bc)
endif
DEFINES += \
@ -94,6 +95,11 @@ DEFINES += \
-DMOZILLA_OFFICIAL=$(MOZILLA_OFFICIAL) \
$(NULL)
MOZ_MOBILE_COMPAT = @MOZ_MOBILE_COMPAT@
ifeq (Tablets,$(MOZ_MOBILE_COMPAT))
DEFINES += -DMOZ_TABLETS_ONLY=1
endif
GARBAGE += \
AndroidManifest.xml \
classes.dex \

1
mobile/xul/branding/aurora/configure.sh
View File

@ -1,3 +1,4 @@
MOZ_APP_DISPLAYNAME=Aurora
ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
MOZ_UPDATER=1
MOZ_MOBILE_COMPAT=Tablets

1
mobile/xul/branding/beta/configure.sh
View File

@ -1,3 +1,4 @@
MOZ_APP_DISPLAYNAME="Firefox Beta"
ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
MOZ_UPDATER=
MOZ_MOBILE_COMPAT=Tablets

1
mobile/xul/branding/nightly/configure.sh
View File

@ -1,2 +1,3 @@
MOZ_APP_DISPLAYNAME=Nightly
MOZ_UPDATER=1
MOZ_MOBILE_COMPAT=All

1
mobile/xul/branding/official/configure.sh
View File

@ -1,3 +1,4 @@
MOZ_APP_DISPLAYNAME=Firefox
ANDROID_PACKAGE_NAME=org.mozilla.firefox
MOZ_UPDATER=
MOZ_MOBILE_COMPAT=Tablets

1
mobile/xul/branding/unofficial/configure.sh
View File

@ -1,3 +1,4 @@
ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
MOZ_APP_DISPLAYNAME=Fennec
MOZ_UPDATER=
MOZ_MOBILE_COMPAT=All