Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
This commit is contained in:
Danilo Aimini
2021-07-16 13:21:55 -07:00
50 changed files with 937 additions and 414 deletions
@@ -57,5 +57,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
PRIVATE
AZ::AzCore
Gem::EMotionFX_Atom.Static
RUNTIME_DEPENDENCIES
Gem::EMotionFX.Editor
)
endif()