Commit 708ce94d authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_31564_v2'

parents c14d7361 57732f7e
...@@ -9,9 +9,7 @@ cd /var/tmp/build ...@@ -9,9 +9,7 @@ cd /var/tmp/build
mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff@eff.org.xpi mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff@eff.org.xpi
mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
[% c("var/touch") %] $ext_dir $ext_dir/*
zip -d $apk META-INF/\*
[% c('zip', { [% c('zip', {
zip_src => [ '$ext_dir' ], zip_src => [ '$ext_dir' ],
zip_args => '$apk', zip_args => '$apk',
...@@ -43,5 +41,18 @@ zip -d $apk lib/\* ...@@ -43,5 +41,18 @@ zip -d $apk lib/\*
rm -fR lib rm -fR lib
# Bug 31564: Android Gradle Plugin has a reproducibility bug. Decompile and recompile to fix ordering of resources.arsc files
apktool=$rootdir/[% c('input_files_by_name/apktool') %]
java -jar $apktool d --no-src -o decompiled $apk
java -jar $apktool b -o $apk decompiled
# Fix timestamps and remove extra field info from zip entries
unzip $apk -d tmp
rm $apk
cd tmp
[% c('zip', {
zip_src => [ '.' ],
zip_args => '$apk',
}) %]
# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
...@@ -100,3 +100,7 @@ input_files: ...@@ -100,3 +100,7 @@ input_files:
# To generate a new keystore, see how-to-generate-keystore.txt # To generate a new keystore, see how-to-generate-keystore.txt
- filename: android-qa.keystore - filename: android-qa.keystore
enable: '[% c("var/android") %]' enable: '[% c("var/android") %]'
- URL: https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.4.0.jar
name: apktool
sha256sum: a0f116e8916d6f21160e1559847bb8b8c32ee71900f321cafeadbe37b87ebcc1
enable: '[% c("var/android") %]'
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment