소스 검색

Revert "Support Google Play 16 KB Page Size Requirement (#13470)"

This reverts commit 4b2aa3f102697b1ace7455c24c6c07f802c07476.

If you need to support the Google Play 16 kiB page size requirement, the recommendation is to use NDK r28c or newer, which automatically aligns binaries correctly.
Sam Lantinga 1 개월 전
부모
커밋
53dbe1862e
3개의 변경된 파일0개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 4
      Android.mk
  2. 0 3
      CMakeLists.txt
  3. 0 1
      test/CMakeLists.txt

+ 0 - 4
Android.mk

@@ -88,10 +88,6 @@ ifeq ($(NDK_DEBUG),1)
     cmd-strip :=
 endif
 
-# https://developer.android.com/guide/practices/page-sizes
-LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
-LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
-
 LOCAL_STATIC_LIBRARIES := cpufeatures
 
 include $(BUILD_SHARED_LIBRARY)

+ 0 - 3
CMakeLists.txt

@@ -1275,9 +1275,6 @@ if(ANDROID)
     set(HAVE_SDL_MISC TRUE)
   endif()
 
-  # https://developer.android.com/guide/practices/page-sizes
-  list(APPEND EXTRA_LDFLAGS_BUILD "-Wl,-z,max-page-size=16384" "-Wl,-z,common-page-size=16384")
-
   # SDL_spinlock.c Needs to be compiled in ARM mode.
   # There seems to be no better way currently to set the ARM mode.
   # see: https://issuetracker.google.com/issues/62264618

+ 0 - 1
test/CMakeLists.txt

@@ -40,7 +40,6 @@ macro(add_sdl_test_executable TARGET)
     list(APPEND SDLTEST_TARGETS ${TARGET})
     if(ANDROID)
         add_library(${TARGET} SHARED ${AST_UNPARSED_ARGUMENTS})
-        set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384")
     else()
         add_executable(${TARGET} ${AST_UNPARSED_ARGUMENTS})
     endif()