Skip to content

Android 2 10 1 #894

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.

Sign up for GitHub

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

Merged
stonedDiscord merged 4 commits into from
Feb 24, 2023
Merged

Android 2 10 1 #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d00f5a6
ask for file permissions before trying to load a file
stonedDiscord Feb 22, 2023
3980dc4
create armv7 gitignore
stonedDiscord Feb 22, 2023
f0e8e94
extract all the abis
stonedDiscord Feb 22, 2023
580e059
don't fail if the dir exists
stonedDiscord Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,22 +165,21 @@ jobs:
- name: Install Android BASS
if: matrix.platform == 'android'
run: |
mkdir ./android/libs/
mkdir ./android/libs/armeabi-v7a/
mkdir -p ./android/libs/armeabi-v7a/
curl http://www.un4seen.com/files/bass24-android.zip -o bass.zip
unzip -d bass -o bass.zip
unzip -o bass.zip -d bass
cp ./bass/libs/armeabi-v7a/libbass.so ./lib/
cp ./bass/libs/armeabi-v7a/libbass.so ./android/libs/armeabi-v7a/
unzip -o bass.zip "libs/*" -d "./android/libs/"

curl http://www.un4seen.com/files/bassmidi24-android.zip -o bassmidi.zip
unzip -d bass -o bassmidi.zip
cp ./bass/libs/armeabi-v7a/libbassmidi.so ./lib/
cp ./bass/libs/armeabi-v7a/libbassmidi.so ./android/libs/armeabi-v7a/
unzip -o bassmidi.zip "libs/*" -d "./android/libs/"

curl http://www.un4seen.com/files/bassopus24-android.zip -o bassopus.zip
unzip -d bass -o bassopus.zip
cp ./bass/libs/armeabi-v7a/libbassopus.so ./lib/
cp ./bass/libs/armeabi-v7a/libbassopus.so ./android/libs/armeabi-v7a/
unzip -o bassopus.zip "libs/*" -d "./android/libs/"

- name: qmake
if: matrix.platform != 'android'
Expand Down Expand Up @@ -221,7 +220,7 @@ jobs:
shell: bash
run: |
cp ../scripts/launch.sh .
mkdir imageformats
mkdir -p imageformats
cp ../QtApng/plugins/imageformats/libqapng.so ./imageformats/libqapng.so
chmod +x launch.sh
chmod +x Attorney_Online
Expand Down Expand Up @@ -252,8 +251,7 @@ jobs:
working-directory: ${{github.workspace}}/
shell: bash
run: |
mkdir ./build/libs/
mkdir ./build/libs/armeabi-v7a/
mkdir -p ./build/libs/armeabi-v7a/
mv ./bin/*.so ./build/libs/armeabi-v7a/
cp ./QtApng/plugins/imageformats/libplugins_imageformats_qapng_armeabi-v7a.so ./build/libs/armeabi-v7a/
androiddeployqt --android-platform android-24 --input android-Attorney_Online-deployment-settings.json --output ./build/ --apk ./bin/AttorneyOnline.apk
Expand Down
3 changes: 3 additions & 0 deletions android/libs/armeabi-v7a/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
libbass.so
libbassmidi.so
libbassopus.so
6 changes: 6 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ int main(int argc, char *argv[])

AOApplication main_app(argc, argv);

#ifdef ANDROID
if(QtAndroid::checkPermission("android.permission.READ_EXTERNAL_STORAGE")==QtAndroid::PermissionResult::Denied) {
QtAndroid::requestPermissionsSync({"android.permission.READ_EXTERNAL_STORAGE","android.permission.WRITE_EXTERNAL_STORAGE"});
}
#endif

AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib");
QResource::registerResource(main_app.get_asset("themes/" + Options::getInstance().theme() + ".rcc"));

Expand Down