Skip to content
GitLab
Menu
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
576c12b5
Commit
576c12b5
authored
Jul 17, 2019
by
sisbell
Committed by
Georg Koppen
Aug 29, 2019
Browse files
Bug 31173: Update android-toolchain project to match firefox
parent
d2c194dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
projects/android-toolchain/build
View file @
576c12b5
...
...
@@ -15,28 +15,29 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME
# NDK Archive
cd
$
NDK_HOME
mv
android
-
ndk
-
r1
5c
/*
.
rm
-
fR
android
-
ndk
-
r1
5c
mv
android
-
ndk
-
r1
7b
/*
.
rm
-
fR
android
-
ndk
-
r1
7b
# The architectures we support
.
/
build
/
tools
/
make_standalone_toolchain
.
py
--
api
[
%
c
(
"var/android_min_api_armv7"
)
%
]
--
arch
arm
--
install
-
dir
=
.
/
arm
.
/
build
/
tools
/
make_standalone_toolchain
.
py
--
api
[
%
c
(
"var/android_min_api_x86"
)
%
]
--
arch
x86
--
install
-
dir
=
.
/
x86
.
/
build
/
tools
/
make_standalone_toolchain
.
py
--
api
[
%
c
(
"var/android_min_api_aarch64"
)
%
]
--
arch
arm64
--
install
-
dir
=
.
/
arm64
# Tool Archives
cd
$
SDK_HOME
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/build_tools
_26
"
)
%
]
-
d
$
SDK_HOME
mkdir
-
p
build
-
tools
/
2
6
.0
.
2
mv
android
-
8.1
.
0
/*
build
-
tools
/
2
6
.0
.
2
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/build_tools"
)
%
]
-
d
$
SDK_HOME
mkdir
-
p
build
-
tools
/
2
7
.0
.
3
mv
android
-
8.1
.
0
/*
build
-
tools
/
2
7
.0
.
3
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/platform
_26
"
)
%
]
-
d
$
SDK_HOME
mkdir
-
p
platforms
/
android
-
2
6
mv
android
-
8.0
.
0
/*
platforms
/
android
-
2
6
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/platform"
)
%
]
-
d
$
SDK_HOME
mkdir
-
p
platforms
/
android
-
2
8
mv
android
-
9
/*
platforms
/
android
-
2
8
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/platform_tools
_26
"
)
%
]
-
d
$
SDK_HOME
unzip
-
qq
$
HOME
/
[
%
c
(
"input_files_by_name/platform_tools"
)
%
]
-
d
$
SDK_HOME
# Cleanup
rm
-
fR
android
-
8.1
.
0
rm
-
fR
android
-
8.0
.
0
rm
-
fR
android
-
9
# Archive dist directory
cd
/
var
/
tmp
/
dist
...
...
projects/android-toolchain/config
View file @
576c12b5
# vim: filetype=yaml sw=2
filename
:
'
[%
project
%]-[%
c("version")
%]-[%
c("var/build_id")
%].tar.gz'
version
:
2
6
.0.
2
version
:
2
7
.0.
3
var
:
container
:
use_container
:
1
...
...
@@ -18,21 +18,21 @@ var:
google_repo
:
https://dl.google.com/android/repository
input_files
:
-
project
:
container-image
-
URL
:
'
[%
c("var/google_repo")
%]/build-tools_r2
6
.0.
2
-linux.zip'
name
:
build_tools
_26
sha256sum
:
a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce
-
URL
:
'
[%
c("var/google_repo")
%]/platform-2
6
_r0
2
.zip'
name
:
platform
_26
sha256sum
:
2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a
-
URL
:
'
[%
c("var/google_repo")
%]/platform-tools_r2
6
.0.
2
-linux.zip'
name
:
platform_tools
_26
sha256sum
:
63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519
-
URL
:
'
[%
c("var/google_repo")
%]/build-tools_r2
7
.0.
3
-linux.zip'
name
:
build_tools
sha256sum
:
5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97
-
URL
:
'
[%
c("var/google_repo")
%]/platform-2
8
_r0
4
.zip'
name
:
platform
sha256sum
:
967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded
-
URL
:
'
[%
c("var/google_repo")
%]/platform-tools_r2
8
.0.
3
-linux.zip'
name
:
platform_tools
sha256sum
:
38fccfe8d2646dd12bdd7cad22fedba0493425b98ebd6d620e4c670b9af4c53f
-
URL
:
'
[%
c("var/google_repo")
%]/sdk-tools-linux-4333796.zip'
name
:
android_sdk_tools
sha256sum
:
92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-
URL
:
'
[%
c("var/google_repo")
%]/android-ndk-r1
5c
-linux-x86_64.zip'
-
URL
:
'
[%
c("var/google_repo")
%]/android-ndk-r1
7b
-linux-x86_64.zip'
name
:
android_ndk_compiler
sha256sum
:
f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c
-
URL
:
https://services.gradle.org/distributions/gradle-4.1-bin.zip
sha256sum
:
5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
-
URL
:
https://services.gradle.org/distributions/gradle-4.1
0.2
-bin.zip
name
:
gradle_bin
sha256sum
:
d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43
sha256sum
:
b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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