Integrating latest 47acbe8

cmake/Platform/Android/PAL_android.cmake

@@ -9,26 +9,26 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(PAL_EXECUTABLE_APPLICATION_FLAG)
+ly_set(PAL_EXECUTABLE_APPLICATION_FLAG)
 set(PAL_LINKOPTION_MODULE MODULE)
 
-set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
-set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
-set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
-set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
-set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
-set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS)
-set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE TRUE)
+ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
+ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
+ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE)
+ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE)
+ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS)
+ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE TRUE)
 
 # Test library support
-set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED FALSE)
-set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED FALSE)
-set(PAL_TRAIT_TEST_PYTEST_SUPPORTED FALSE)
-set(PAL_TRAIT_TEST_TARGET_TYPE MODULE)
+ly_set(PAL_TRAIT_TEST_GOOGLE_TEST_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_TEST_GOOGLE_BENCHMARK_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_TEST_PYTEST_SUPPORTED FALSE)
+ly_set(PAL_TRAIT_TEST_TARGET_TYPE MODULE)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(PAL_TRAIT_COMPILER_ID Clang)
-    set(PAL_TRAIT_COMPILER_ID_LOWERCASE clang)
+    ly_set(PAL_TRAIT_COMPILER_ID Clang)
+    ly_set(PAL_TRAIT_COMPILER_ID_LOWERCASE clang)
 else()
     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported in ${PAL_PLATFORM_NAME}")
 endif()
@@ -38,7 +38,7 @@ set(LY_ASSET_DEPLOY_ASSET_TYPE "es3" CACHE STRING "Set the asset type for deploy
 
 # Set the python cmd tool
 if(PAL_HOST_PLATFORM_NAME_LOWERCASE STREQUAL "windows")
-    set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.cmd)
+    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.cmd)
 else()
-    set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
+    ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/Tools/Python/python3.sh)
 endif()