Skip to content

Commit 923b94f

Browse files
authored
Merge branch 'libsdl-org:main' into x11tk
2 parents c86bd09 + 5f77da3 commit 923b94f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1638
-871
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ jobs:
536536
uses: nttld/setup-ndk@v1
537537
with:
538538
local-cache: true
539-
ndk-version: r21e
539+
ndk-version: r28c
540540
- name: 'Setup Java JDK'
541541
uses: actions/setup-java@v4
542542
with:

Android.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
108108

109109
LOCAL_LDFLAGS := -Wl,--no-undefined -Wl,--no-undefined-version -Wl,--version-script=$(LOCAL_PATH)/src/dynapi/SDL_dynapi.sym
110110

111-
# https://developer.android.com/guide/practices/page-sizes
112-
LOCAL_LDFLAGS += "-Wl,-z,max-page-size=16384"
113-
LOCAL_LDFLAGS += "-Wl,-z,common-page-size=16384"
114-
115111
ifeq ($(NDK_DEBUG),1)
116112
cmd-strip :=
117113
endif

0 commit comments

Comments
 (0)