From bf0df4b36962fa7dcbbe5b62d59e8e65ace2b5ca Mon Sep 17 00:00:00 2001
From: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
Date: Tue, 1 Jun 2021 16:37:30 -0700
Subject: [PATCH] Add Android 'gradle' job as a default job (#1082)

* Add Android 'gradle' job as a default job

* Replace warning about version checking type with string preprocessing of the captured version before comparisons
---
 cmake/Tools/common.py                            | 6 +++++-
 scripts/build/Platform/Android/build_config.json | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmake/Tools/common.py b/cmake/Tools/common.py
index 9c0d31cd53..1990041c86 100755
--- a/cmake/Tools/common.py
+++ b/cmake/Tools/common.py
@@ -316,7 +316,11 @@ def verify_tool(override_tool_path, tool_name, tool_filename, argument_name, too
         version_match = tool_version_regex.search(version_output)
         if not version_match:
             raise RuntimeError()
-        result_version = LooseVersion(str(version_match.group(1)).strip())
+
+
+        # Since we are doing a compare, strip out any non-numeric and non . character from the version otherwise we will get a TypeError on the LooseVersion comparison
+        result_version_str = re.sub(r"[^\.0-9]", "", str(version_match.group(1)).strip())
+        result_version = LooseVersion(result_version_str)
 
         if min_version and result_version < min_version:
             raise LmbrCmdError(f"The {tool_desc} does not meet the minimum version of {tool_name} required ({str(min_version)}).",
diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index b871670cd0..33248ffe26 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -136,6 +136,7 @@
   },
   "gradle": {
     "TAGS":[
+        "default",
         "weekly-build-metrics"
     ],
     "COMMAND":"gradle_windows.cmd",