Commit Graph

760 Commits

Author SHA1 Message Date
Steve Pham 59e43813f0 GCC Support for Linux
Updates and fixes to support GCC for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-20 13:00:02 -08:00
Scott Romero 9d3f8e0b7d [development] minor Android toolchain updates (#6931)
Fixed issue with Android NDK r23 native only builds where the platform version was ignored
Bumped the default ANDROID_NATIVE_API_LEVEL to 24 so it matches the Android project generator scripts
Removed some unnecessary information from message strings

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2022-01-19 09:09:32 -08:00
AMZN-byrcolin d9e636f77e fix edge case with deprecated pal functions (#6976)
* fix edge case with deprecated pal functions

Signed-off-by: byrcolin <byrcolin@amazon.com>
2022-01-18 12:12:55 -08:00
amzn-phist 2a9990ead3 Fix engine template issue (#6927)
* fix get_enabled_gem_cmake_file to work with "Dem" or "Code" or "Gem/Code" folder in a project
fix o3de_restricted_path to make the past paramter optional

Signed-off-by: byrcolin <byrcolin@amazon.com>

* Fix resolution of variables in `cmake_path(COMPARE)` calls in PAL.cmake

The documentation for `cmake_path(COMPARE)` states that parameters marked as [<input>](https://cmake.org/cmake/help/latest/command/cmake_path.html#conventions) are string literals.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

Co-authored-by: byrcolin <byrcolin@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-18 08:27:06 -08:00
Nicholas Lawson 27d256679a Update the package of Pybind11 that o3de points at to be the latest version (#6898)
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2022-01-18 08:16:25 -08:00
amzn-sj 76ff7aec29 Fix type (#6919)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-14 19:41:18 -06:00
Vincent Liu 5885270640 [iOS] Update to use AWSNativeSDK 1.9.50 (#6890)
Signed-off-by: onecent1101 <liug@amazon.com>
2022-01-14 14:36:15 -08:00
AMZN-byrcolin c778606c89 Templates restricted (#6498)
* Templates/Restricted upgrade/fixes:
Fixed template storage format: templates now only store true relative paths and no longer save "origin" paths and "optional" has been removed, it was never used.
Upgraded all templates to new standard
Template system now correctly handles child objects: Child objects no longer have to specify restricted they inherit from parent
Restricted now operates at the object level and makes no assumptions about parent
Restricted templates can now be combined and seperated on creation
ly_get_list_relative_filename has been deprecated for o3de_pal_dir
All Gems/Projects/Templates updated to use new code

Signed-off-by: byrcolin <byrcolin@amazon.com>
2022-01-14 10:27:20 -08:00
Chris Burel 4392c8963c [Linux] Prefer higher versioned clang compilers to lower versions (#6824)
If the user does not specify which compiler to use via cache variables in
the CMake invocation, we perform a search for which version to use.
Previously this was done using a glob search on some pre-defined paths, and
then sorting the results using `list(SORT ... COMPARE NATURAL)`. Sorting in
this manner results in lower versions being moved to the head of the list.
The first result in the list was then used. Consequently, if the user has
`clang-11` and `clang-12` installed, `clang-11` was chosen.

This reverses the sort order so that the highest installed version is
chosen.

Signed-off-by: Chris Burel <burelc@amazon.com>
2022-01-14 09:00:26 -08:00
AMZN-stankowi e1572ce5c9 Updating assimp to the v12 packages (#6861)
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2022-01-14 08:49:42 -08:00
amzn-sj 073994e8e7 Remove quotes around list (#6864)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-12 19:34:34 -06:00
amzn-sj 068244b1bb Remove quotes around list of paths (#6857)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2022-01-12 12:00:33 -08:00
Vincent Liu b9787fb2b3 [Mac] Update to use AWSNativeSDK 1.9.50 (#6797) 2022-01-11 17:24:33 -08:00
lumberyard-employee-dm f09055af42 Fixed CMake use with Android NDK 23 (#6460)
* Fixed CMake use with Android NDK 23

This was done by only setting the `ANDROID_ARM_MODE` if the ANDROID_ABI
starts with `armeabi`.

The Android arm mode setting can't be used using non-`armeabi` ABIs.
In O3DE we default to `arm64-v8a` `ANDROID_ABI`
So `ANDROID_ARM_MODE` must not be set.

The CMake [Android-Determine.cmake](https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/Platform/Android-Determine.cmake#L573-585) which is used to detect platform-wide information when the CMAKE_SYSTEM_NAME is set to android, enforces that if the `CMAKE_ANDROID_ARCH_ABI` doesn't start with `armeabi`, then it will fatal error if the CMAKE_ANDROID_ARM_MODE option is set.

In Android NDK 21 the `ANDROID_ARM_MODE` variable is used to set the CMAKE_ANDROID_ARM_MODE variable if the [ANDROID_ABI](https://android.googlesource.com/platform/ndk/+/refs/tags/ndk-r21e/build/cmake/android.toolchain.cmake#700) starts with `armeabi`.

This meant when using Android NDK 21, the CMake Android-Determine.cmake module would succeed, due
to the CMAKE_ANDROID_ARM_MODE not being set.

In Android NDK 23 the `ANDROID_ARM_MODE` now will set the
`CMAKE_ANDROID_ARM_MODE` variable to `TRUE` if it isn't defined.

Added an `--extra-cmake-configure-args` option to the `generate_android_project.py` script which can be used to append user specified CMake arguments to the cmake configure step (`cmake -B <build-dir> -S <source-dir> -DCMAKE_TOOLCHAIN_FILE=<android-toolchain-file> <extra-args>`)

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the O3DE Android toolchain wrapper to fatal error if the 64-bit
arm ABI isn't used.

Also removed the unneccessary setting of the ANDROID_ARM_MODE and
ANDROID_ARM_NEON option option now that the armeabi cannot be specified
as an ABI.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-10 19:11:00 -06:00
Esteban Papp 0f7e55cf59 Some fixes for paths with spaces (#6757)
* Some fixes for paths with spaces

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-10 10:00:29 -08:00
Vincent Liu ad9bcba6e2 [Linux] Update to use AWSNativeSDK 1.9.50 (#6715) 2022-01-06 13:17:48 -08:00
Esteban Papp 05da6aaa67 Removes unnecessary loop (#6684)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2022-01-05 09:26:08 -08:00
Vincent Liu 2b9d1ca813 Update to use AWSNativeSDK 1.9.50 (#6618)
* Update to use AWSNativeSDK 1.9.50
* After SDK upgrade, some AWS objects are bound to SDK allocator, init AWS SDK for unit test
2022-01-04 12:45:51 -08:00
Esteban Papp 74f0cb5b98 Removes LuxCore (#6491)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-22 09:06:28 -08:00
Mike Chang 6c299000a7 Notices automation install (#6228)
This will generate the NOTICES.txt license file and SPDX-Licenses.json manifest file on every installer run.

Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-08 12:45:44 -08:00
AMZN-Phil 1cbe4261db Force a string check on the version numbers
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-12-07 17:10:26 -08:00
AMZN-Phil 6e2ca2b929 Use version check to allow for a defined empty string to fail and greater to check build number is a number greater than 0
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-12-07 15:12:11 -08:00
AMZN-Phil 6301e44d33 Check whether env variables are defined
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-12-07 14:05:05 -08:00
Nicholas Lawson 201777c1d1 ASTC (Ios texture compressor) for mac was built in debug. (#6182)
* Updates the mac version of ASTC Encoder to actually use release build

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-12-07 08:42:52 -08:00
Sean Sweeney 0a73ba2e1d Merge pull request #5775 from aws-lumberyard-dev/test_artifact_collection
LyTestTools artifact collection
2021-12-03 10:57:50 -08:00
Mike Chang cfb426b86c Add conditional to pull O3DE_BUILD_VERSION through environment var (#6096)
Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-02 17:05:42 -08:00
amzn-sj e407191b64 Update AWS package version for MacOS (#6058)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-12-02 16:15:27 -06:00
evanchia 1cdaf8e95a Merge branch 'development' into test_artifact_collection
Signed-off-by: evanchia <evanchia@amazon.com>
2021-12-02 11:20:43 -08:00
Mike Chang 8b3c76d8b8 Add platform specific codesign script and modifications for Linux and Windows installer packaging (#5893)
Signed-off-by: Mike Chang <changml@amazon.com>
2021-12-01 17:14:00 -08:00
Esteban Papp 93ec5de552 Enables monolithic for ServerLauncher (#5883)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-30 15:09:20 -08:00
Esteban Papp 858885dca9 Removes all files from linux install (#6019)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-30 13:46:53 -08:00
evanchia 9a8f26fab5 moved cmake variables
Signed-off-by: evanchia <evanchia@amazon.com>
2021-11-29 10:45:35 -08:00
moraaar b196473465 O3DE using new 3rdParty PhysX SDK package rev 5 (#5829)
PR with changes to PhysX SDK package: o3de/3p-package-source#71

This fixes O3DE building monolithically on linux and windows.

Signed-off-by: moraaar moraaar@amazon.com
2021-11-24 08:15:52 +00:00
Junbo Liang d6121b5ac6 Merge commit 'b3c0200345eb56d7a35b8a75deb12b479b0a839a' into junbo/gitflow_211123_o3de 2021-11-23 13:29:21 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840)
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-22 14:21:02 -08:00
Steve Pham b3c0200345 Restore missing variable 'target_filename_ext' needed to determine if RPATH fix is necessary or not (#5824)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-22 08:58:24 -08:00
Esteban Papp 7100d48e16 Cherry-picking some changes from stabilization into development (#5810)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 15:59:21 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
Merge stabilization/2110
2021-11-19 15:46:16 -08:00
Esteban Papp dbc5d7a8bc Cherry-pick of Linux deb package to stabilization (#5778)
* Cherry-pick 49e8f35858

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Merging differences from development of other changes that need to be there for deb packaging

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Picks a needed change for the installer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Takes version from environment if defined

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not pick up version if it is empty string since that will also break version comparison

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* creating temp directories if they dont exist

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 14:07:25 -08:00
puvvadar 1aa444d669 Update build copy back to Developer Preview
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-11-19 11:40:01 -08:00
lumberyard-employee-dm b0dc1ea6fa CMake Xcode Generator fix (#5771)
Removed the generator expression from the `LY_ARCHIVE_FILE_SEARCH_MODE` define as Xcode doesn't support per-config per-file definitions.

Updated the #else block in ArchiveVars to default to PakOnly mode if the `LY_ARCHIVE_FILE_SEARCH_MODE` define isn't set.

Moved the the `LY_ARCHIVE_FILE_SEARCH_MODE` Cache Variable from cmake/Deployment.cmake to feature_options.cmake within the AzFramework folder.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-19 11:23:38 -06:00
puvvadar 5b5e22af51 Merge commit '1f0ac46d68599296a8095967f410d196c466ec5e' into puvvadar/gitflow_211118_o3de 2021-11-19 09:18:58 -08:00
puvvadar 15a5d74330 Merge commit '199a59e8f9824cef4a5c0ac3da1683bb7ded66a6' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:39 -08:00
puvvadar ef25271d80 Merge commit 'e8576acbb0510717d57f168096a9cc6ad0c2fbf9' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:01 -08:00
AMZN-Phil 1f0ac46d68 Merge pull request #5731 from aws-lumberyard-dev/Prism/WindowsInstallerName
Change developer preview tag
2021-11-19 07:30:48 -08:00
Steve Pham 199a59e8f9 Update package and hash for pyside2 (#5773)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-11-18 17:30:24 -08:00
evanchia 27d2437308 Defaults the LyTestTools TestResults folder to <cmake_build>/Testing. Also removes the default saving of logs on launcher cleanup and automatically saves logs for tests using the editor_test module
Signed-off-by: evanchia <evanchia@amazon.com>
2021-11-18 16:34:06 -08:00
Esteban Papp 49e8f35858 Creates a deb package (#5567)
* configure/generation working

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Generates deb package forLinux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes to EngineFinder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changes the owner of the installed folder so it is writable by the user

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* jenkins scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes execution permission for scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes wrong parameter to build for linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of clang parameters in build_config.json

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Simplifies and fixes build configs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes to EngineFinder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds linux deb package upload and small fixes/organization cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes checksum generation

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Some more small fixes for reviewing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Test if this space is necessary for cpack

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* More fixes for installer jobs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adding eval to variables that need to double-expand

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removing unused variables being passed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not remove symlink

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Use cmake_path for concatenating paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing quotes so the variable expands

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* cleaned up some variables that have way too many ways to be passed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Multiple fixes for Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Cleanup/re-organization

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes some temp variables so we can run cpack jenkins jobs locally

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Delays cmake download to install step
Cleanup on installer_windows.cmd, we already have the path to cpack (same as cmake, which is added to the path)
Some simplification in the windows installer generation, we now generate the same even if we dont upload

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes mac install

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* CPack can generate hashes for us
Defiine CPACK_OUTPUT_FILE_PREFIX to prevent the exe/msi from ending in the bin dir
Remove unnecessary generation of folder from 3rdPartyPacakges which fails when including from cpack

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* multiple fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes for linux/mac/windows (fixing discrepancies with Jenkins)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* uploads to S3 from the upload directory and fixes the latest upload

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds ERROR_VARIABLE to S3 upload to find a Jenkins issue

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* printing command invocation to try to figure out the errors

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes the hashing algorithm to sha256 and fixes the cmd used to call to pythojn

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* wrong path being passed in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes compiler parameters from a config job (after rebase)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes fro deb packaging job

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* small fix for fingerprint patching for latest

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changing extension of public key and leaving better TODO places for code signing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes sdl as a dependency, leaving it commented since it is needed for wwise

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes runtime copy during install, makes it more consistent with regular runtime dependencies and optimizes copy when there is already an install

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* $ENV{DESTDIR} and CMAKE_INSTALL_PREFIX cannot be used in cmake_path because the CMAKE_INSTALL_PREFIX is absolute

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixing some runtime_dependencies optimizations, we cannot take size of a bundle

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac for an unused variable

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes a variable that was being passed to fix qt frameworks

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* More fixes for Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updates email to use for maintainer to match certificate

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* make directory because in some cases the dependency is copied before the actual library and the directory has to be created

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for a new warning/error in linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* The sha file is created after the upload happens, so creating it

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove the size comparison for install since it stomps over the copy from the target and doesnt trigger stripping

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-18 16:26:49 -08:00
Danilo Aimini e8576acbb0 Replace old Developer Preview release name with Stable 21.11 (#5759)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-18 14:16:56 -08:00
puvvadar 93ce3fa82f Merge commit 'a051bdeeb0687d07851c0034fe9dc7e14dbf541f' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:17 -08:00