Skip to content

Commit 17f4e59

Browse files
author
Thomas Grenier
committed
Fix calls to jnidispatch on Android with 16KB page size
1 parent 3befd7f commit 17f4e59

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Features
1111

1212
Bug Fixes
1313
---------
14+
* [#1618](https://github.com/java-native-access/jna/issues/1618): Fix calls to jnidispatch on Android with 16KB page size - [@Thomyrock](https://github.com/Thomyrock)
1415

1516
Release 5.15.0
1617
==============

native/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ CPP=$(PREFIX)cpp
176176
LD=$(CC)
177177
RANLIB=$(PREFIX)ranlib
178178
STRIP=$(PREFIX)strip -x
179-
CDEFINES=-DFFI_STATIC_BUILD -DNO_JAWT -DNO_WEAK_GLOBALS -DFFI_MMAP_EXEC_WRIT=1 -DFFI_MMAP_EXEC_SELINUX=0
179+
CDEFINES=-DFFI_STATIC_BUILD -DNO_JAWT -DNO_WEAK_GLOBALS -DFFI_MMAP_EXEC_WRIT=1 -DFFI_MMAP_EXEC_SELINUX=0 -Dmalloc_getpagesize='getpagesize()'
180180
COPT+=-fpic -ffunction-sections -funwind-tables -fno-short-enums
181181
JAVA_INCLUDES=
182182
CINCLUDES+=-I"$(NDK_PLATFORM)/arch-$(AARCH)/usr/include" # -I/usr/include
183183
LIBS=-nostdlib -L"$(NDK_PLATFORM)/arch-$(AARCH)$(ALIBDIR)/" -lgcc -lc -ldl -lm
184-
LDFLAGS+=-Wl,-shared,-Bsymbolic -Wl,--build-id=sha1
184+
LDFLAGS+=-Wl,-shared,-Bsymbolic -Wl,--build-id=sha1 -Wl,-z,max-page-size=16384
185185
FFI_ENV=CPP="$(CPP)" CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG) $(CINCLUDES)" CPPFLAGS="$(CDEFINES) $(CINCLUDES)" LIBS="$(LIBS)" RANLIB="$(RANLIB)"
186186
FFI_CONFIG=--enable-static --disable-shared --with-pic=yes --host=$(HOST)
187187
endif

0 commit comments

Comments
 (0)