Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Merge pull request #3161 from element-hq/feature/bma/fdoirBuildFix

Browse source 
Add `--alignment-preserved true` when signing APK for F-Droid.
This commit is contained in:
Benoit Marty 2024-07-08 18:21:26 +02:00 • committed by GitHub
commit 53bd0ebd79
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/pull_request_template.md vendored
View file

@ -1,12 +1,5 @@
<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request --> <!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
## Type of change
- [ ] Feature
- [ ] Bugfix
- [ ] Technical
- [ ] Other :
## Content ## Content
<!-- Describe shortly what has been changed --> <!-- Describe shortly what has been changed -->

4
tools/release/release.sh
View file

@ -227,6 +227,7 @@ cp "${fdroidTargetPath}"/app-fdroid-arm64-v8a-release.apk \
"${fdroidTargetPath}"/app-fdroid-arm64-v8a-release-signed.apk "${fdroidTargetPath}"/app-fdroid-arm64-v8a-release-signed.apk
"${buildToolsPath}"/apksigner sign \ "${buildToolsPath}"/apksigner sign \
-v \ -v \
--alignment-preserved true \
--ks "${keyStorePath}" \ --ks "${keyStorePath}" \
--ks-pass pass:"${keyStorePassword}" \ --ks-pass pass:"${keyStorePassword}" \
--ks-key-alias elementx \ --ks-key-alias elementx \
@ -238,6 +239,7 @@ cp "${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release.apk \
"${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release-signed.apk "${fdroidTargetPath}"/app-fdroid-armeabi-v7a-release-signed.apk
"${buildToolsPath}"/apksigner sign \ "${buildToolsPath}"/apksigner sign \
-v \ -v \
--alignment-preserved true \
--ks "${keyStorePath}" \ --ks "${keyStorePath}" \
--ks-pass pass:"${keyStorePassword}" \ --ks-pass pass:"${keyStorePassword}" \
--ks-key-alias elementx \ --ks-key-alias elementx \
@ -249,6 +251,7 @@ cp "${fdroidTargetPath}"/app-fdroid-x86-release.apk \
"${fdroidTargetPath}"/app-fdroid-x86-release-signed.apk "${fdroidTargetPath}"/app-fdroid-x86-release-signed.apk
"${buildToolsPath}"/apksigner sign \ "${buildToolsPath}"/apksigner sign \
-v \ -v \
--alignment-preserved true \
--ks "${keyStorePath}" \ --ks "${keyStorePath}" \
--ks-pass pass:"${keyStorePassword}" \ --ks-pass pass:"${keyStorePassword}" \
--ks-key-alias elementx \ --ks-key-alias elementx \
@ -260,6 +263,7 @@ cp "${fdroidTargetPath}"/app-fdroid-x86_64-release.apk \
"${fdroidTargetPath}"/app-fdroid-x86_64-release-signed.apk "${fdroidTargetPath}"/app-fdroid-x86_64-release-signed.apk
"${buildToolsPath}"/apksigner sign \ "${buildToolsPath}"/apksigner sign \
-v \ -v \
--alignment-preserved true \
--ks "${keyStorePath}" \ --ks "${keyStorePath}" \
--ks-pass pass:"${keyStorePassword}" \ --ks-pass pass:"${keyStorePassword}" \
--ks-key-alias elementx \ --ks-key-alias elementx \