Bug 752681 - Make official XUL Fennec builds install on xlarge tablets only [r=blassey, a=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Mon, 14 May 2012 18:16:09 -0700
changeset 95771 7bac62505304eabe93d2e47aa15205bb32418fa9
parent 95770 7ced703e9e5236a26cb402ef789afa1b7b3e6f43
child 95772 0d31d9b5318985d03246170781955193bbeb4567
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, mfinkle
bugs752681
milestone14.0a2
Bug 752681 - Make official XUL Fennec builds install on xlarge tablets only [r=blassey, a=mfinkle]
embedding/android/AndroidManifest.xml.in
mobile/xul/branding/aurora/configure.sh
mobile/xul/branding/beta/configure.sh
mobile/xul/branding/nightly/configure.sh
mobile/xul/branding/official/configure.sh
mobile/xul/branding/unofficial/configure.sh
mobile/xul/config/mozconfigs/android/release
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -11,17 +11,17 @@
       >
 
     <uses-sdk android:minSdkVersion="5"
               android:targetSdkVersion="11"/>
 
 #ifdef MOZ_TABLETS_ONLY
     <supports-screens android:smallScreens="false"
                       android:normalScreens="false"
-                      android:largeScreens="true"
+                      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"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
--- a/mobile/xul/branding/aurora/configure.sh
+++ b/mobile/xul/branding/aurora/configure.sh
@@ -1,4 +1,3 @@
 MOZ_APP_DISPLAYNAME=Aurora
 ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
 MOZ_UPDATER=1
-MOZ_MOBILE_COMPAT=Tablets
--- a/mobile/xul/branding/beta/configure.sh
+++ b/mobile/xul/branding/beta/configure.sh
@@ -1,4 +1,3 @@
 MOZ_APP_DISPLAYNAME="Firefox Beta"
 ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
 MOZ_UPDATER=
-MOZ_MOBILE_COMPAT=Tablets
--- a/mobile/xul/branding/nightly/configure.sh
+++ b/mobile/xul/branding/nightly/configure.sh
@@ -1,3 +1,2 @@
 MOZ_APP_DISPLAYNAME=Nightly
 MOZ_UPDATER=1
-MOZ_MOBILE_COMPAT=All
--- a/mobile/xul/branding/official/configure.sh
+++ b/mobile/xul/branding/official/configure.sh
@@ -1,4 +1,3 @@
 MOZ_APP_DISPLAYNAME=Firefox
 ANDROID_PACKAGE_NAME=org.mozilla.firefox
 MOZ_UPDATER=
-MOZ_MOBILE_COMPAT=Tablets
--- a/mobile/xul/branding/unofficial/configure.sh
+++ b/mobile/xul/branding/unofficial/configure.sh
@@ -1,4 +1,3 @@
 ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
 MOZ_APP_DISPLAYNAME=Fennec
 MOZ_UPDATER=
-MOZ_MOBILE_COMPAT=All
--- a/mobile/xul/config/mozconfigs/android/release
+++ b/mobile/xul/config/mozconfigs/android/release
@@ -13,11 +13,12 @@ ac_add_options --with-android-tools="/to
 ac_add_options --with-android-toolchain=/tools/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86
 ac_add_options --with-android-platform=/tools/android-ndk-r5c/platforms/android-5/arch-arm
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export JAVA_HOME=/tools/jdk6
 export MOZILLA_OFFICIAL=1
+export MOZ_MOBILE_COMPAT=Tablets
 
 ac_add_options --enable-official-branding
 ac_add_options --with-branding=mobile/xul/branding/beta