Bug 1279935 - --apk-armv7-v9 is no longer necessary as it has been removed in 48. r=jlund

MozReview-Commit-ID: EfSrnAaFapZ

--HG--
extra : rebase_source : f7f4953b2073aeefd84e68959caae4f83b9fd007

testing/mozharness/scripts/get_apk.py

@@ -57,7 +57,8 @@ class GetAPK(BaseScript, VirtualenvMixin):
 
     arch_values = ["arm", "x86"]
     multi_api_archs = ["arm"]
-    multi_apis = ["api-9", "api-15"] # v11 has been dropped in fx 46 (1155801)
+    multi_apis = ["api-15"] # v11 has been dropped in fx 46 (1155801)
+    # v9 has been dropped in fx 48 (1220184)
 
     download_dir = "apk-download"
 

testing/mozharness/scripts/push_apk.py

@@ -3,7 +3,7 @@
 
     Upload the apk of a Firefox app on Google play
     Example for a beta upload:
-    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v9=/path/to/fennec-XX.0bY.multi.android-arm-v9.apk --apk-armv7-v15=/path/to/fennec-XX.0bY.multi.android-arm-v15.apk --track production --push_apk
+    $ python push_apk.py --package-name org.mozilla.firefox_beta --service-account foo@developer.gserviceaccount.com --credentials key.p12 --apk-x86=/path/to/fennec-XX.0bY.multi.android-i386.apk --apk-armv7-v15=/path/to/fennec-XX.0bY.multi.android-arm-v15.apk --track production --push_apk
 
     Debian/Ubuntu dependencies: python-googleapi python-oauth2client
 """
@@ -128,7 +128,7 @@ class PushAPK(BaseScript, GooglePlayMixin, VirtualenvMixin):
         if not os.path.isfile(self.config['apk_file_x86']):
             self.fatal("Could not find " + self.config['apk_file_x86'])
 
-        if not os.path.isfile(self.config['apk_file_armv7_v9']):
+        if self.config.get('apk_file_armv7_v9') and not os.path.isfile(self.config['apk_file_armv7_v9']):
             self.fatal("Could not find " + self.config['apk_file_armv7_v9'])
 
         if not os.path.isfile(self.config['apk_file_armv7_v15']):
@@ -215,9 +215,11 @@ class PushAPK(BaseScript, GooglePlayMixin, VirtualenvMixin):
         """ Upload the APK files """
         self.check_argument()
         service = self.connect_to_play()
-        apks = [self.config['apk_file_armv7_v9'], self.config['apk_file_armv7_v15'], self.config['apk_file_x86']]
+        apks = [self.config['apk_file_armv7_v15'], self.config['apk_file_x86']]
         if self.config.get('apk_file_armv6'):
             apks.append(self.config['apk_file_armv6'])
+        if self.config.get('apk_file_armv7_v9'):
+            apks.append(self.config['apk_file_armv7_v9'])
         self.upload_apks(service, apks)
 
     def test(self):