Revert some releng changes

.taskcluster.yml

@@ -33,7 +33,7 @@ tasks:
             && git checkout ${event.pull_request.head.sha}
             && echo "--" > .adjust_token
             && python tools/l10n/check_locales.py
-            && ./gradlew --no-daemon clean assembleFocusDebug assembleKlarNightly assembleRelease detektCheck ktlint lintFocusDebug lintKlarNightly pmd checkstyle spotbugs assembleFocusDebugAndroidTest testFocusDebugUnitTest testKlarNightlyUnitTest
+            && ./gradlew --no-daemon clean assembleFocusX86Debug assembleKlarX86Nightly assembleRelease detektCheck ktlint lintFocusX86Debug lintKlarX86Nightly pmd checkstyle spotbugs assembleFocusX86DebugAndroidTest testFocusX86DebugUnitTest testKlarX86NightlyUnitTest
             && pip install "compare-locales>=5.0.2,<6.0"
             && compare-locales --validate l10n.toml .
         artifacts:

.travis.yml

@@ -20,9 +20,9 @@ before_install:
   - tools/taskcluster/accept-license.sh
 
 script:
-  - ./gradlew -Pcoverage --no-daemon clean assembleFocusNightly
+  - ./gradlew -Pcoverage --no-daemon clean assembleFocusX86Nightly
   - echo "--" > .adjust_token
-  - ./gradlew -Pcoverage --no-daemon jacocoTestReportFocusNightly
+  - ./gradlew -Pcoverage --no-daemon jacocoTestReportFocusX86Nightly
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -49,12 +49,13 @@ Before you attempt to make a contribution please read the [Community Participati
 2. Import the project into Android Studio **or** build on the command line:
 
   ```shell
-  ./gradlew clean app:assembleFocusDebug
+  ./gradlew clean app:assembleFocusArmDebug
   ```
 
 3. Make sure to select the correct build variant in Android Studio:
-**focusDebug** for Focus
-**klarDebug** for Klar
+**focusArmDebug** for ARM
+**focusX86Debug** for X86
+**focusAarch64Debug** for ARM64
 
 ## Pre-push hooks
 To reduce review turn-around time, we'd like all pushes to run tests locally. We'd

quality/pre-push-recommended.sh

@@ -18,8 +18,8 @@
         ktlint \
         pmd \
         detektCheck \
-        assembleFocusDebugAndroidTest \
-        testFocusDebugUnitTest
+        assembleFocusX86DebugAndroidTest \
+        testFocusX86DebugUnitTest
 
 # Tasks omitted because they take a long time to run:
 # - unit test on all variants

tools/docker/Dockerfile

@@ -94,7 +94,7 @@ RUN git clone https://github.com/mozilla-mobile/focus-android.git
 
 # Build project and run gradle tasks once to pull all dependencies
 WORKDIR /opt/focus-android
-RUN ./gradlew --no-daemon assemble testFocusDebugUnitTest lint pmd checkstyle spotbugs detektCheck ktlint
+RUN ./gradlew --no-daemon assemble testFocusX86DebugUnitTest lint pmd checkstyle spotbugs detektCheck ktlint
 
 # -- Post setup -------------------------------------------------------------------------
 

tools/taskcluster/flank-conf-geckoview-arm.yml

@@ -24,8 +24,8 @@ gcloud:
   #results-history-name: tmp_parallel 
 
   # test and app are the only required args
-  app: /opt/focus-android/app/build/outputs/apk/klarArm/debug/app-klar-armeabi-v7a-debug.apk
-  test: /opt/focus-android/app/build/outputs/apk/androidTest/klarArm/debug/app-klar-armeabi-v7a-debug-androidTest.apk
+  app: /opt/focus-android/app/build/outputs/apk/klarArm/debug/app-klar-arm-debug.apk
+  test: /opt/focus-android/app/build/outputs/apk/androidTest/klarArm/debug/app-klar-arm-debug-androidTest.apk
   auto-google-login: true
   use-orchestrator: true
   environment-variables:

tools/taskcluster/flank-conf-webview-arm.yml

@@ -24,8 +24,8 @@ gcloud:
   #results-history-name: tmp_parallel 
 
   # test and app are the only required args
-  app: /opt/focus-android/app/build/outputs/apk/focusArm/debug/app-focus-armeabi-v7a-debug.apk
-  test: /opt/focus-android/app/build/outputs/apk/androidTest/focusArm/debug/app-focus-armeabi-v7a-debug-androidTest.apk
+  app: /opt/focus-android/app/build/outputs/apk/focusArm/debug/app-focus-arm-debug.apk
+  test: /opt/focus-android/app/build/outputs/apk/androidTest/focusArm/debug/app-focus-arm-debug-androidTest.apk
   auto-google-login: true
   use-orchestrator: true
   environment-variables:

tools/taskcluster/schedule-master-build.py

@@ -69,7 +69,8 @@ def generate_compare_locales_task():
 def generate_ui_test_task(dependencies, engine="Klar", device="arm"):
     '''
     :param str engine: Klar, Webview
-    :return: uiWebviewTestTaskId, uiWebviewTestTask
+    :param str device: ARM, X86
+    :return: uiWebviewARMTestTaskId, uiWebviewARMTestTask
     '''
     if engine is "Klar":
         engine = "geckoview"
@@ -80,10 +81,10 @@ def generate_ui_test_task(dependencies, engine="Klar", device="arm"):
     else:
         raise Exception("ERROR: unknown engine type --> Aborting!")
 
-    task_name = "(Focus for Android) UI tests - {0}".format(engine)
-    task_description = "Run UI tests for {0} build for Android.".format(engine)
-    build_dir = "assemble{0}Debug".format(assemble_engine)
-    build_dir_test = "assemble{0}DebugAndroidTest".format(assemble_engine)
+    task_name = "(Focus for Android) UI tests - {0} {1}".format(engine, device)
+    task_description = "Run UI tests for {0} build for Android.".format(engine, device)
+    build_dir = "assemble{0}Debug".format(assemble_engine, device.capitalize())
+    build_dir_test = "assemble{0}DebugAndroidTest".format(assemble_engine, device.capitalize())
     print('BUILD_DIR: {0}'.format(build_dir))
     print('BUILD_DIR_TEST: {0}'.format(build_dir_test))
     device = device.lower()
@@ -113,7 +114,7 @@ def upload_apk_nimbledroid_task(dependencies):
         name="(Focus for Android) Upload Debug APK to Nimbledroid",
         description="Upload APKs to Nimbledroid for performance measurement and tracking.",
         command=('echo "--" > .adjust_token'
-                 ' && ./gradlew --no-daemon clean assembleKlarNightly'
+                 ' && ./gradlew --no-daemon clean assembleKlarArmNightly'
                  ' && python tools/taskcluster/upload_apk_nimbledroid.py'),
         dependencies=dependencies,
         scopes=['secrets:get:project/focus/nimbledroid'],

tools/taskcluster/upload_apk_nimbledroid.py

@@ -43,7 +43,7 @@ def uploadGeckoViewExampleApk(key):
 data = secrets.get('project/focus/nimbledroid')
 
 # disable focus webview upload until https://github.com/mozilla-mobile/focus-android/issues/3574 is resolved
-klar_file = {'apk': open('app/build/outputs/apk/klar/nightly/app-klar-armeabi-v7a-nightly-unsigned.apk')}
+klar_file = {'apk': open('app/build/outputs/apk/klar/nightly/app-klar-arm-nightly-unsigned.apk')}
 # focus_file = {'apk': open('app/build/outputs/apk/focusArm/release/app-focus-arm-release-unsigned.apk')}
 
 # also upload the latest geckoview example from: