Always enable 16KB alignment for 64-bit Android.

Author: levlam

CMake/TdSetUpCompiler.cmake

@@ -65,6 +65,10 @@ function(td_set_up_compiler)
         set(TD_LINKER_FLAGS "-Wl,--gc-sections")
       elseif (ANDROID)
         set(TD_LINKER_FLAGS "-Wl,--gc-sections -Wl,--exclude-libs,ALL -Wl,--icf=safe")
+        if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+          # Enable 16 KB ELF alignment
+          set(TD_LINKER_FLAGS "${TD_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
+        endif()
       else()
         set(TD_LINKER_FLAGS "-Wl,--gc-sections -Wl,--exclude-libs,ALL")
       endif()

example/android/CMakeLists.txt

@@ -41,11 +41,6 @@ if (CMAKE_CROSSCOMPILING)
   endif()
   target_compile_definitions(tdjni PRIVATE PACKAGE_NAME="org/drinkless/tdlib")
 
-  if (${ANDROID_ABI} STREQUAL "arm64-v8a" OR ${ANDROID_ABI} STREQUAL "x86_64")
-    # Enable 16 KB ELF alignment.
-    target_link_options(tdjni PRIVATE "-Wl,-z,max-page-size=16384")
-  endif()
-
   add_custom_command(TARGET tdjni POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:tdjni> $<TARGET_FILE:tdjni>.debug
     COMMAND ${CMAKE_STRIP} --strip-debug --strip-unneeded $<TARGET_FILE:tdjni>.debug -o $<TARGET_FILE:tdjni>)