From 2d84ab6e717264cb4ed959a78c69100b771ef325 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Fri, 10 Nov 2017 09:05:57 -0800
Subject: [PATCH] Bug 1417232 - Part 0: Extract |mach android
 archive-geckoview|. r=ted.mielczarek

We've had good success with |mach android *| for invoking test suites
and other Gradle-related features; this was just an oversight.  The
real advantage is that almost all of the magic Gradle targets are now
in mobile/android/mach_commands.py and not scattered throughout the
tree.  That'll make it easier to move the actual Gradle configuration
choices forward in the future.

MozReview-Commit-ID: GI1pUHHfXeO

--HG--
extra : rebase_source : 9d7b98e968a2537f8dd1ffd0646c51ffe429bd57
---
 mobile/android/mach_commands.py                   | 15 +++++++++++++++
 .../builds/releng_base_android_64_builds.py       |  6 ++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
index 852cc52b7075..2bcf5e3fcd9a 100755
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -289,6 +289,21 @@ class MachCommands(MachCommandBase):
         return 0
 
 
+    @SubCommand('android', 'archive-geckoview',
+        """Create GeckoView archives.
+        See http://firefox-source-docs.mozilla.org/build/buildsystem/toolchains.html#firefox-for-android-with-gradle""")
+    @CommandArgument('args', nargs=argparse.REMAINDER)
+    def android_archive_geckoview(self, args):
+        gradle_targets = [
+            'geckoview:assembleWithGeckoBinaries',
+            'geckoview_example:assembleWithGeckoBinaries',
+            'geckoview:uploadArchives',
+        ]
+        ret = self.gradle(gradle_targets + ["--continue"] + args, verbose=True)
+
+        return ret
+
+
     @Command('gradle', category='devenv',
         description='Run gradle.',
         conditions=[conditions.is_android])
diff --git a/testing/mozharness/configs/builds/releng_base_android_64_builds.py b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
index 526cc33415f6..dba80d9348b9 100644
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -130,10 +130,8 @@ config = {
     # binaries are in the object directory, ready to be packaged into the
     # GeckoView AAR.
     'postflight_build_mach_commands': [
-        ['gradle',
-         'geckoview:assembleWithGeckoBinaries',
-         'geckoview_example:assembleWithGeckoBinaries',
-         'uploadArchives',
+        ['android',
+         'archive-geckoview',
         ],
     ],
 }