-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bump targetSdk to 30 (again :p) #276
Conversation
4b09fa9
to
9738c85
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it works, then /shrug ;-)
It is a work in progress. It works fine for both sdcv and unversioned libraries. The only deal breaker is libluacompat52.so, which is found 3 times and only the last one is copied to My idea is to fix koreader/koreader-base#1237 first (deversioning but renaming as needed), put everything as jniLibs and make symbolic links that match other platforms at runtime using |
This comment has been minimized.
This comment has been minimized.
3cfd6c5
to
ebceaad
Compare
681fc14
to
0198bea
Compare
@Frenzie @NiLuJe: this is ready to review. Works fine on top of current master. Mainly we attempt to extract all assets in "module" in a single step. for each asset:
Other minor changes:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No real comments while reading, but I haven't yet tested it.
Updated to support executing sdcv with targetSdk 30. Shared libraries are untouched as there's no way to get them outside Another related topic is the translation of https://github.com/koreader/android-luajit-launcher/blob/master/app/src/main/res/values/strings.xml. Since we have different projects hosted on weblate I think we can afford one extra project :) |
Updated on top of master, which a few other fixes for recent-ish changes. Ready to be reviewed (and hopefully merged) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No comment. I trust you on the symlink stuff. ;-)
Binaries need to be bundled as shared libraries to avoid W^X on Android 10+
Is still possible to dlopen libraries from app home directory on Android 11, but that might change soon.
Symlink binaries stored in readable storage to the app home dir, where they're expected. Read symlinks from
assets/module/map.txt
This works fine for binaries, but for shared libraries the minSdk needs to be bumped to API23. Since we're fine with targetSdk 30, as we were with targetSdk 28, there's no need to overcomplicate stuff for now.
At build time:
libs/$(ANDROID_ABI)
assets/module/map.txt
At runtime map.txt is checked and symbolic links created.
This change is