Fix android generation linux (o3de#18123) (o3de#18128)

Signed-off-by: Steve Pham <[email protected]>

Author: spham-amzn

cmake/3rdParty/BuiltInPackages.cmake

@@ -13,7 +13,7 @@
 
 #include the platform-specific 3rd party packages.
 o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${O3DE_ENGINE_RESTRICTED_PATH}" "${LY_ROOT_FOLDER}")
-set(LY_PAL_PACKAGE_FILE_NAME ${pal_dir}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}${LY_HOST_ARCHITECTURE_NAME_EXTENSION}.cmake)
+set(LY_PAL_PACKAGE_FILE_NAME ${pal_dir}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}${LY_ARCHITECTURE_NAME_EXTENSION}.cmake)
 include(${LY_PAL_PACKAGE_FILE_NAME})
 
 # add the above file to the ALLFILES list, so that they show up in IDEs

cmake/Configurations.cmake

@@ -208,5 +208,5 @@ endforeach()
 
 # flags are defined per platform, follow platform files under Platform/<PlatformName>/Configurations_<platformname>(_<platformarchitecture>).cmake
 o3de_pal_dir(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME} "${O3DE_ENGINE_RESTRICTED_PATH}" "${LY_ROOT_FOLDER}")
-include(${pal_dir}/Configurations_${PAL_PLATFORM_NAME_LOWERCASE}${LY_HOST_ARCHITECTURE_NAME_EXTENSION}.cmake)
+include(${pal_dir}/Configurations_${PAL_PLATFORM_NAME_LOWERCASE}${LY_ARCHITECTURE_NAME_EXTENSION}.cmake)
 

cmake/PAL.cmake

@@ -261,9 +261,12 @@ ly_set(PAL_HOST_PLATFORM_NAME ${LY_HOST_PLATFORM_DETECTION_${CMAKE_SYSTEM_NAME}}
 string(TOLOWER ${PAL_HOST_PLATFORM_NAME} PAL_HOST_PLATFORM_NAME_LOWERCASE)
 ly_set(PAL_HOST_PLATFORM_NAME_LOWERCASE ${PAL_HOST_PLATFORM_NAME_LOWERCASE})
 
-# In addition to host platform name, set the host platform architecture if supported
-if (LY_HOST_ARCHITECTURE_DETECTION_${CMAKE_SYSTEM_NAME})
-    ly_set(LY_HOST_ARCHITECTURE_NAME_EXTENSION "_${LY_HOST_ARCHITECTURE_DETECTION_${CMAKE_SYSTEM_NAME}}")
+# In addition to platform name, set the platform architecture if supported
+if (LY_ARCHITECTURE_DETECTION_${PAL_PLATFORM_NAME})
+    ly_set(LY_ARCHITECTURE_NAME_EXTENSION "_${LY_ARCHITECTURE_DETECTION_${PAL_PLATFORM_NAME}}")
+endif()
+if (LY_HOST_ARCHITECTURE_DETECTION_${PAL_HOST_PLATFORM_NAME})
+    ly_set(LY_HOST_ARCHITECTURE_NAME_EXTENSION "_${LY_HOST_ARCHITECTURE_DETECTION_${PAL_HOST_PLATFORM_NAME}}")
 endif()
 
 

cmake/Platform/Android/PALDetection_android.cmake

@@ -9,6 +9,10 @@
 ly_set(LY_PLATFORM_DETECTION_Android Android)
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin)
     ly_set(LY_HOST_PLATFORM_DETECTION_Android Mac)
+elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Linux)
+    # Linux supports multiple system architectures
+    ly_set(LY_HOST_PLATFORM_DETECTION_Android ${CMAKE_HOST_SYSTEM_NAME})
+    ly_set(LY_HOST_ARCHITECTURE_DETECTION_Android ${CMAKE_HOST_SYSTEM_PROCESSOR})
 else()
     ly_set(LY_HOST_PLATFORM_DETECTION_Android ${CMAKE_HOST_SYSTEM_NAME})
 endif()

cmake/Platform/Linux/PALDetection_linux.cmake

@@ -10,4 +10,5 @@ ly_set(LY_PLATFORM_DETECTION_Linux Linux)
 ly_set(LY_HOST_PLATFORM_DETECTION_Linux Linux)
 
 # Linux supports multiple system architectures
-ly_set(LY_HOST_ARCHITECTURE_DETECTION_Linux ${CMAKE_SYSTEM_PROCESSOR})
+ly_set(LY_ARCHITECTURE_DETECTION_Linux ${CMAKE_SYSTEM_PROCESSOR})
+ly_set(LY_HOST_ARCHITECTURE_DETECTION_Linux ${CMAKE_HOST_SYSTEM_PROCESSOR})