Bug 791267 - Back out d627e554fff4 (bug 788666) hack for ABI filtering on Google Play [r=mfinkle]

--HG--
extra : rebase_source : bf8c4aa533982fcaba3dc88ae7823877666fc9c5

mobile/android/base/AndroidManifest.xml.in

@@ -9,11 +9,6 @@
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
       >
-
-#ifdef ARMV7_ONLY
-    <supports-screens android:smallScreens="false" />
-#endif
-
     <uses-sdk android:minSdkVersion="8"
               android:targetSdkVersion="14"/>
 

mobile/android/base/Makefile.in

@@ -230,7 +230,6 @@ FENNEC_PP_XML_FILES = \
 
 ifneq (,$(findstring -march=armv7,$(OS_CFLAGS)))
 MIN_CPU_VERSION=7
-DEFINES += -DARMV7_ONLY=1
 else
 MIN_CPU_VERSION=5
 endif