Merge branch 'main' into ly-as-sdk/LYN-2948

# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py

scripts/build/Platform/Android/build_config.json

@@ -99,7 +99,7 @@
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
         "ASSET_PROCESSOR_BINARY": "bin\\profile\\AssetProcessorBatch.exe",
         "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode --regset=\"/Amazon/AssetProcessor/Settings/Exclude Android/pattern=.*/DiffuseGlobalIllumination/.*precompiledshader\"",
-        "ASSET_PROCESSOR_PLATFORMS":"es3"
+        "ASSET_PROCESSOR_PLATFORMS":"android"
     }
   },
   "release": {

scripts/build/Platform/Linux/build_config.json

@@ -83,7 +83,7 @@
       "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -L FRAMEWORK_googletest"
+      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -LE SUITE_sandbox -L FRAMEWORK_googletest"
     }
   },
   "test_profile_nounity": {
@@ -95,7 +95,7 @@
       "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -L FRAMEWORK_googletest"
+      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -LE SUITE_sandbox -L FRAMEWORK_googletest"
     }
   },
   "asset_profile": {

scripts/build/Platform/Mac/build_config.json

@@ -86,7 +86,7 @@
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
       "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode",
-      "ASSET_PROCESSOR_PLATFORMS": "osx_gl"
+      "ASSET_PROCESSOR_PLATFORMS": "mac"
     }
   },
   "periodic_test_profile": {

scripts/build/lambda/trigger_first_build.py

@@ -53,7 +53,7 @@ def lambda_handler(event, context):
         backoff = 30
         status_list = [404]  # Retry if the branch doesn't exist yet and provide time for Jenkins to discover it.
         method_list = ['POST']
-        retry_config = Retry(total=retries, backoff_factor=backoff, status_forcelist=status_list, method_whitelist=method_list)
+        retry_config = Retry(total=retries, backoff_factor=backoff, status_forcelist=status_list, allowed_methods=method_list)
 
         session = requests.Session()
         session.mount('https://', HTTPAdapter(max_retries=retry_config))

scripts/build/package/package.py

@@ -25,9 +25,6 @@ from glob3 import glob
 def package(options):
     package_env = PackageEnv(options.platform, options.type, options.package_env)
 
-    # Override values in bootstrap.cfg for PC package
-    override_bootstrap_cfg(package_env)
-
     if not package_env.get('SKIP_BUILD'):
         print(package_env.get('SKIP_BUILD'))
         print('SKIP_BUILD is False, running CMake build...')
@@ -51,34 +48,6 @@ def get_python_path(package_env):
         return os.path.join(package_env.get('ENGINE_ROOT'), 'python', 'python.sh')
 
 
-def override_bootstrap_cfg(package_env):
-    print('Override values in bootstrap.cfg')
-    engine_root = package_env.get('ENGINE_ROOT')
-    bootstrap_path = os.path.join(engine_root, 'bootstrap.cfg')
-    replace_values = {'project_path':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
-    try:
-        with open(bootstrap_path, 'r') as bootstrap_cfg:
-            content = bootstrap_cfg.read()
-    except:
-        error('Cannot read file {}'.format(bootstrap_path))
-    content = content.split('\n')
-    new_content = []
-    for line in content:
-        if not line.startswith('--'):
-            strs = line.split('=')
-            if len(strs):
-                key = strs[0].strip(' ')
-                if key in replace_values:
-                    line = '{}={}'.format(key, replace_values[key])
-        new_content.append(line)
-    try:
-        with open(bootstrap_path, 'w') as out:
-            out.write('\n'.join(new_content))
-    except:
-        error('Cannot write to file {}'.format(bootstrap_path))
-    print('{} updated with value {}'.format(bootstrap_path, replace_values))
-
-
 def cmake_build(package_env):
     build_targets = package_env.get('BUILD_TARGETS')
     for build_target in build_targets:

scripts/bundler/gen_shaders.py

@@ -163,11 +163,11 @@ def add_shaders_types():
     shaders.append(gl4)
 
     gles3 = _ShaderType('GLES3', 'GLSL_HLSLcc')
-    gles3.add_configuration('Android', 'es3')
+    gles3.add_configuration('Android', 'android')
     shaders.append(gles3)
 
     metal = _ShaderType('METAL', 'METAL_LLVM_DXC')
-    metal.add_configuration('Mac', 'osx_gl')
+    metal.add_configuration('Mac', 'mac')
     metal.add_configuration('iOS', 'ios')
     shaders.append(metal)