Address feedback

Author: grendello

eng/native/configureplatform.cmake

@@ -494,6 +494,13 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
+if (CLR_CMAKE_TARGET_ANDROID)
+    # Google requires all the native libraries to be aligned to 16 bytes (for 16k memory page size)
+    # This applies only to 64-bit binaries
+    if(CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
+        add_link_options(LINKER:-z,max-page-size=16384)
+    endif()
+endif()
 string(TOLOWER "${CMAKE_BUILD_TYPE}" LOWERCASE_CMAKE_BUILD_TYPE)
 if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL debug)
     # Clear _FORTIFY_SOURCE=2, if set

src/mono/CMakeLists.txt

@@ -503,12 +503,10 @@ else()
   message(FATAL_ERROR "TARGET_ARCH='${TARGET_ARCH}' not supported.")
 endif()
 
-if(TARGET_ANDROID AND (TARGET_AMD64 OR TARGET_ARM64))
+if(HOST_ANDROID AND (HOST_AMD64 OR HOST_ARM64))
   # Google requires all the native libraries to be aligned to 16 bytes (for 16k memory page size)
   # This applies only to 64-bit binaries
-  if((TARGET_ARCH STREQUAL "arm64") OR (TARGET_ARCH STREQUAL "x86_64"))
-    add_link_options(LINKER:-z,max-page-size=16384)
-  endif()
+  add_link_options(LINKER:-z,max-page-size=16384)
 endif()
 
 # arm64 MacCatalyst runtime host or AOT target is more like Apple mobile targets than x64

src/native/libs/CMakeLists.txt

@@ -58,12 +58,6 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
         if (CROSS_ROOTFS)
             include_directories(SYSTEM "${CROSS_ROOTFS}/usr/include")
         endif ()
-
-        # Google requires all the native libraries to be aligned to 16 bytes (for 16k memory page size)
-        # This applies only to 64-bit binaries
-        if(CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-            add_link_options(-Wl,-z,max-page-size=16384)
-        endif()
     endif ()
 
     string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE)