Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthew Finkel
tor-browser-build
Commits
57732f7e
Verified
Commit
57732f7e
authored
Sep 16, 2019
by
sisbell
Committed by
boklm
Oct 05, 2019
Browse files
Bug 31564: Android bundles based on ESR 68 are not built reproducibly anymore
parent
d430f8ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
projects/tor-browser/build.android
View file @
57732f7e
...
...
@@ -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/noscript'
)
%]
$ext_dir
/
{
73a6fe31-595d-460b-a920-fcc0f8843232
}
.xpi
[
% c
(
"var/touch"
)
%]
$ext_dir
$ext_dir
/
*
zip
-d
$apk
META-INF/
\*
[
% c
(
'zip'
,
{
zip_src
=>
[
'$ext_dir'
]
,
zip_args
=>
'$apk'
,
...
...
@@ -43,5 +41,18 @@ zip -d $apk 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
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
projects/tor-browser/config
View file @
57732f7e
...
...
@@ -100,3 +100,7 @@ input_files:
# To generate a new keystore, see how-to-generate-keystore.txt
-
filename
:
android-qa.keystore
enable
:
'
[%
c("var/android")
%]'
-
URL
:
https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.4.0.jar
name
:
apktool
sha256sum
:
a0f116e8916d6f21160e1559847bb8b8c32ee71900f321cafeadbe37b87ebcc1
enable
:
'
[%
c("var/android")
%]'
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment