diff --git a/NOTES b/NOTES index 3c69aa9..da11caa 100644 --- a/NOTES +++ b/NOTES @@ -698,7 +698,8 @@ Anyways, there's a bunch of stuff remaining to do, and then I will release it. -XXX - figure out android.permission.REQUEST_INSTALL_PACKAGES +XXX - find location of native libs (it no longer updates the lib-> symlink!) + XXX - call checkSelfPermission/requestPermission to get WRITE_EXTERNAL_STORAGE (it only works now because it's grandfathered in) XXX - fix color problem with newest API (override all colors, i think only the STOP/START button remains?) @@ -719,3 +720,6 @@ XXX - test it upgraded and installed on oldish device (set up android emulator) XXX - test it installed on x86 with android emulator XXX - libiconv? HAVE_ICONV_H etc +XXX - changelog: + - API 28 + - x86_64, arm64 diff --git a/doit b/doit index 5a4995d..19f877f 100755 --- a/doit +++ b/doit @@ -1,17 +1,19 @@ #!/bin/sh +instlib() { + for i in `ls libs` + do + mkdir -p app/src/main/lib/$i || return 1 + mv libs/$i/"$1" app/src/main/lib/$i/"$2" || return 1 + done +} + ~/Android/Sdk/ndk-bundle/ndk-build -j8 && mkdir -p app/src/main/lib/armeabi-v7a && -mv libs/armeabi-v7a/scp app/src/main/lib/armeabi-v7a/libscp.so && -mv libs/armeabi-v7a/sftp-server app/src/main/lib/armeabi-v7a/libsftp-server.so && -mv libs/armeabi-v7a/rsync app/src/main/lib/armeabi-v7a/librsync.so && -mv libs/armeabi-v7a/buffersu app/src/main/lib/armeabi-v7a/libbuffersu.so && -mv libs/armeabi-v7a/libsimplesshd-jni.so app/src/main/lib/armeabi-v7a/ && -mkdir -p app/src/main/lib/x86 && -mv libs/x86/scp app/src/main/lib/x86/libscp.so && -mv libs/x86/sftp-server app/src/main/lib/x86/libsftp-server.so && -mv libs/x86/rsync app/src/main/lib/x86/librsync.so && -mv libs/x86/buffersu app/src/main/lib/x86/libbuffersu.so && -mv libs/x86/libsimplesshd-jni.so app/src/main/lib/x86/ && +instlib scp libscp.so && +instlib sftp-server libsftp-server.so && +instlib rsync librsync.so && +instlib buffersu libbuffersu.so && +instlib libsimplesshd-jni.so "" && ./gradlew assembleRelease && andinst app/build/outputs/apk/release/app-release.apk diff --git a/jni/Application.mk b/jni/Application.mk index ad06cd3..91520e2 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,2 +1,2 @@ APP_PLATFORM := android-16 -APP_ABI := armeabi-v7a x86 +APP_ABI := all diff --git a/rsync/config.h b/rsync/config.h index 11b9707..f4e9238 100644 --- a/rsync/config.h +++ b/rsync/config.h @@ -76,6 +76,7 @@ #define HAVE_STRUCT_STAT64 1 #define HAVE_INET_NTOP 1 #define MAJOR_IN_SYSMACROS 1 +#define HAVE_SIZE_T 1 #define HAVE_ASPRINTF 1 #endif /* __RSYNC_CONFIG_H */