Bug 1718341 - Rename arm-4.3 -> arm r=aklotz,nalexander

Differential Revision: https://phabricator.services.mozilla.com/D119220

docs/performance/memory/bloatview.md

@@ -220,7 +220,7 @@ modify are listed below:
 -   Linux: `unittests/linux_unittest.py`
 -   Mac: `unittests/mac_unittest.py`
 -   Windows: `unittests/win_unittest.py`
--   Android: `android/androidarm_4_3.py`
+-   Android: `android/androidarm.py`
 
 ## How to instrument your objects for BloatView
 

mobile/android/mach_commands.py

@@ -479,13 +479,13 @@ class AndroidEmulatorCommands(MachCommandBase):
     @CommandArgument(
         "--version",
         metavar="VERSION",
-        choices=["arm-4.3", "x86-7.0"],
+        choices=["arm", "x86_64"],
         help="Specify which AVD to run in emulator. "
-        'One of "arm-4.3" (Android 4.3 supporting armv7 binaries), or '
-        '"x86-7.0" (Android 7.0 supporting x86 or x86_64 binaries, '
+        'One of "arm" (Android supporting armv7 binaries), or '
+        '"x86_64" (Android supporting x86 or x86_64 binaries, '
         "recommended for most applications). "
-        'By default, "arm-4.3" will be used if the current build environment '
-        'architecture is arm; otherwise "x86-7.0".',
+        'By default, "arm" will be used if the current build environment '
+        'architecture is arm; otherwise "x86_64".',
     )
     @CommandArgument(
         "--wait", action="store_true", help="Wait for emulator to be closed."

taskcluster/ci/generate-profile/kind.yml

@@ -115,7 +115,7 @@ jobs:
             options: [installer-path=/builds/worker/fetches/geckoview-androidTest.apk]
             config:
                 - android/android_common.py
-                - android/androidarm_4_3.py
+                - android/androidarm.py
                 - android/android_pgo.py
         fetches:
             toolchain:

testing/mozbase/mozrunner/mozrunner/devices/android_device.py

@@ -105,7 +105,7 @@ class AvdInfo(object):
    and the parameters for each reflect those used in mozharness.
 """
 AVD_DICT = {
-    "arm-4.3": AvdInfo(
+    "arm": AvdInfo(
         "Android 4.3",
         "mozemulator-4.3",
         "testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest",
@@ -113,7 +113,7 @@ AVD_DICT = {
         ["-skip-adb-auth", "-verbose", "-show-kernel"],
         False,
     ),
-    "x86-7.0": AvdInfo(
+    "x86_64": AvdInfo(
         "Android 7.0 x86/x86_64",
         "mozemulator-x86-7.0",
         "testing/config/tooltool-manifests/androidx86_7_0/mach-emulator.manifest",
@@ -859,10 +859,10 @@ class AndroidEmulator(object):
             return requested
         if self.substs:
             if not self.substs["TARGET_CPU"].startswith("arm"):
-                return "x86-7.0"
+                return "x86_64"
             else:
-                return "arm-4.3"
-        return "x86-7.0"
+                return "arm"
+        return "x86_64"
 
 
 def _find_sdk_exe(substs, exe, tools):

testing/mozharness/configs/android/android_pgo.py

@@ -5,7 +5,7 @@
 # Mozharness configuration for Android PGO.
 #
 # This configuration should be combined with platform-specific mozharness
-# configuration such as androidarm_4_3.py, or similar.
+# configuration such as androidarm.py, or similar.
 
 config = {
     "default_actions": [