From fd7d3a41ee89305e1f16e78981d15924fc49b24d Mon Sep 17 00:00:00 2001
From: spham <spham@amazon.com>
Date: Tue, 20 Apr 2021 08:06:27 -0700
Subject: [PATCH 1/2] Removing 'periodic_test_profile' job from Android due to
 the fact that the Android Virtual Device is not supported on virtualized
 systems (Windows)

---
 .../build/Platform/Android/build_config.json   | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index e5b41973e0..0b71268a43 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -145,23 +145,5 @@
       "GRADLE_BUILD_CMD": "build",
       "ADDITIONAL_GENERATE_ARGS": ""
     }
-  },
-  "periodic_test_profile": {
-    "TAGS":[
-        "nightly",
-        "weekly-build-metrics"
-    ],
-    "COMMAND":"build_and_run_unit_tests.cmd",
-    "PARAMETERS": {
-      "CONFIGURATION":"profile",
-      "OUTPUT_DIRECTORY":"build\\android_unittest",
-      "GAME_PROJECT": "AutomatedTesting",
-      "ANDROID_NDK_PLATFORM": "21",
-      "ANDROID_SDK_PLATFORM": "29",
-      "SIGN_APK": "true",
-      "GRADLE_BUILD_CMD": "assemble",
-      "ADDITIONAL_GENERATE_ARGS": "--unit-test"
-    }
   }
-
 }

From 37949abe2505033e6c23205bc9f3c0fdbef6ce2a Mon Sep 17 00:00:00 2001
From: spham <spham@amazon.com>
Date: Tue, 20 Apr 2021 08:48:52 -0700
Subject: [PATCH 2/2] Restoring original periodic_test_profile block but with
 the TAGS removed

---
 scripts/build/Platform/Android/build_config.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index 0b71268a43..0fa4d9ade3 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -145,5 +145,20 @@
       "GRADLE_BUILD_CMD": "build",
       "ADDITIONAL_GENERATE_ARGS": ""
     }
+  },
+  "periodic_test_profile": {
+    "TAGS":[
+    ],
+    "COMMAND":"build_and_run_unit_tests.cmd",
+    "PARAMETERS": {
+      "CONFIGURATION":"profile",
+      "OUTPUT_DIRECTORY":"build\\android_unittest",
+      "GAME_PROJECT": "AutomatedTesting",
+      "ANDROID_NDK_PLATFORM": "21",
+      "ANDROID_SDK_PLATFORM": "29",
+      "SIGN_APK": "true",
+      "GRADLE_BUILD_CMD": "assemble",
+      "ADDITIONAL_GENERATE_ARGS": "--unit-test"
+    }
   }
 }