diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg index 5bcdc0608..b990abbcd 100644 --- a/project/jni/application/ballfield/AndroidAppSettings.cfg +++ b/project/jni/application/ballfield/AndroidAppSettings.cfg @@ -213,7 +213,7 @@ FirstStartMenuOptions='SettingsMenu.DummyMenu' # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a armeabi-v7a-hard x86 mips -MultiABI='armeabi-v7a x86' +MultiABI='armeabi-v7a x86 arm64-v8a' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src index df6ba47c8..3e385f492 160000 --- a/project/jni/application/hid-pc-keyboard/src +++ b/project/jni/application/hid-pc-keyboard/src @@ -1 +1 @@ -Subproject commit df6ba47c8d73fe94addb7388da9f36c276c22eb3 +Subproject commit 3e385f4924bdf500d3edca1e6b2065cafd3eeb7a diff --git a/project/jni/application/setEnvironment-arm64-v8a.sh b/project/jni/application/setEnvironment-arm64-v8a.sh index f3a7930c8..4d1623668 100755 --- a/project/jni/application/setEnvironment-arm64-v8a.sh +++ b/project/jni/application/setEnvironment-arm64-v8a.sh @@ -68,7 +68,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS= diff --git a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh index 621dd4425..1d25f0c08 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh @@ -68,7 +68,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS= diff --git a/project/jni/application/setEnvironment-armeabi-v7a.sh b/project/jni/application/setEnvironment-armeabi-v7a.sh index 30791354f..7567cbeea 100755 --- a/project/jni/application/setEnvironment-armeabi-v7a.sh +++ b/project/jni/application/setEnvironment-armeabi-v7a.sh @@ -68,7 +68,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS= diff --git a/project/jni/application/setEnvironment-mips.sh b/project/jni/application/setEnvironment-mips.sh index 97e4bb1f8..c5ba299e8 100755 --- a/project/jni/application/setEnvironment-mips.sh +++ b/project/jni/application/setEnvironment-mips.sh @@ -69,7 +69,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS= diff --git a/project/jni/application/setEnvironment-x86.sh b/project/jni/application/setEnvironment-x86.sh index ee95d15a2..a618c4e30 100755 --- a/project/jni/application/setEnvironment-x86.sh +++ b/project/jni/application/setEnvironment-x86.sh @@ -68,7 +68,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS= diff --git a/project/jni/application/setEnvironment.sh b/project/jni/application/setEnvironment.sh index 3208dda03..4a2906e6c 100755 --- a/project/jni/application/setEnvironment.sh +++ b/project/jni/application/setEnvironment.sh @@ -68,7 +68,7 @@ fi UNRESOLVED="-Wl,--no-undefined" SHARED="-shared -Wl,-soname,$SHARED_LIBRARY_NAME" if [ -n "$BUILD_EXECUTABLE" ]; then - SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc" + SHARED="-Wl,--gc-sections -Wl,-z,nocopyreloc -pie" fi if [ -n "$NO_SHARED_LIBS" ]; then APP_SHARED_LIBS=