backout 934ce089223c because xul builds can't install on tegras running 2.2 to run tests
authorBrad Lassey <blassey@mozilla.com>
Mon, 30 Jan 2012 23:34:44 -0500
changeset 87026 e7a004ba490e15b9b83ae24a98bef66e67c56ef0
parent 87025 a3358c5fa80af764d9f961a5a82885d73abaa103
child 87027 d935729476d9a41eb926ae75d834aaa050343081
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
backs out934ce089223cf570c51c798adbe3356ffec12b4c
backout 934ce089223c because xul builds can't install on tegras running 2.2 to run tests
embedding/android/AndroidManifest.xml.in
embedding/android/Makefile.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
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -4,31 +4,19 @@
       package="@ANDROID_PACKAGE_NAME@"
       android:installLocation="auto"
       android:versionCode="@ANDROID_VERSION_CODE@"
       android:versionName="@MOZ_APP_VERSION@"
 #ifdef MOZ_ANDROID_SHARED_ID
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
       >
-
-#ifdef MOZ_TABLETS_ONLY
-    <uses-sdk android:minSdkVersion="11"
-#else
     <uses-sdk android:minSdkVersion="5"
-#endif
               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"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
 
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -74,35 +74,29 @@ PROCESSEDJAVAFILES = \
 
 ifneq (,$(findstring -march=armv7,$(OS_CFLAGS)))
 MIN_CPU_VERSION=7
 else
 MIN_CPU_VERSION=5
 endif
 
 ifeq (,$(ANDROID_VERSION_CODE))
-# decrement the version code by 1 so native 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
-
-ifeq (Tablets,$(MOZ_MOBILE_COMPAT))
-MOZ_TABLETS_ONLY=1
+ANDROID_VERSION_CODE=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10)
 endif
 
 DEFINES += \
   -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
   -DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
   -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
   -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) \
   -DMOZ_MIN_CPU_VERSION=$(MIN_CPU_VERSION) \
   -DMOZ_CRASHREPORTER=$(MOZ_CRASHREPORTER) \
   -DANDROID_VERSION_CODE=$(ANDROID_VERSION_CODE) \
   -DMOZILLA_OFFICIAL=$(MOZILLA_OFFICIAL) \
-  -DMOZ_TABLETS_ONLY=$(MOZ_TABLETS_ONLY) \
   $(NULL)
 
 GARBAGE += \
   AndroidManifest.xml  \
   classes.dex  \
   $(PROCESSEDJAVAFILES) \
   gecko.ap_  \
   res/values/strings.xml \
--- 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