Bug 791267 - Back out d627e554fff4 (bug 788666) hack for ABI filtering on Google Play [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 19 Oct 2012 15:38:06 -0700
changeset 110963 eeaec0df48ee980504a7d3911dac7f457d45136c
parent 110962 d2bfbb259f419799ed0cda3a2cffa1740f4d98f2
child 110964 47b425f4f50c3b3447bd2eb034f8f5158fa37cdf
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersmfinkle
bugs791267, 788666
milestone19.0a1
Bug 791267 - Back out d627e554fff4 (bug 788666) hack for ABI filtering on Google Play [r=mfinkle]
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/Makefile.in
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -4,21 +4,16 @@
       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 ARMV7_ONLY
-    <supports-screens android:smallScreens="false" />
-#endif
-
     <uses-sdk android:minSdkVersion="8"
               android:targetSdkVersion="14"/>
 
 #include ../services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
 #include ../services/manifests/SyncAndroidManifest_permissions.xml.in
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -225,17 +225,16 @@ FENNEC_PP_XML_FILES = \
   res/menu-v11/browser_app_menu.xml \
   res/menu-large-v11/browser_app_menu.xml \
   res/menu-xlarge-v11/browser_app_menu.xml \
   $(NULL)
 
 
 ifneq (,$(findstring -march=armv7,$(OS_CFLAGS)))
 MIN_CPU_VERSION=7
-DEFINES += -DARMV7_ONLY=1
 else
 MIN_CPU_VERSION=5
 endif
 
 MOZ_APP_BUILDID=$(shell cat $(DEPTH)/config/buildid)
 
 ifeq (,$(ANDROID_VERSION_CODE))
 ifeq ($(MIN_CPU_VERSION),7)