Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
ef7f1b0e
Commit
ef7f1b0e
authored
4 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
dockerfile: update tools
Change-Id: I3eb413fbcf433475e97d63ba77d1e6005bee1107
parent
9a5a6836
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile
+13
-14
13 additions, 14 deletions
docker/Dockerfile
ring-android/app/build.gradle
+2
-2
2 additions, 2 deletions
ring-android/app/build.gradle
with
15 additions
and
16 deletions
docker/Dockerfile
+
13
−
14
View file @
ef7f1b0e
...
...
@@ -39,31 +39,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&&
locale-gen
$LANG
$LC_ALL
&&
update-locale
$LANG
$LC_ALL
# Android SDK tools
RUN
wget
-O
/tmp/android-tools.zip https://dl.google.com/android/repository/
sdk-
tools-linux-
4333796
.zip
&&
\
RUN
wget
-O
/tmp/android-tools.zip https://dl.google.com/android/repository/
commandline
tools-linux-
6200805_latest
.zip
&&
\
mkdir
-p
/opt/android-sdk
&&
\
unzip
-q
-d
/opt/android-sdk /tmp/android-tools.zip
&&
\
rm
-f
/tmp/android-tools.zip
&&
\
chown
-R
root:root /opt/android-sdk
# Swig 4.0.1
RUN
wget
-O
/tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.1.tar.gz
RUN
tar
xzf /tmp/swig.tar.gz
-C
/opt
RUN
cd
/opt/swig-rel-4.0.1/
&&
./autogen.sh
&&
./configure
&&
make
&&
make
install
RUN
wget
-O
/tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.1.tar.gz
&&
\
tar
xzf /tmp/swig.tar.gz
-C
/opt
&&
\
cd
/opt/swig-rel-4.0.1/
&&
./autogen.sh
&&
./configure
&&
make
&&
make
install
&&
\
cd
..
&&
rm
-rf
/opt/swig-rel-4.0.1 /tmp/swig.tar.gz
ENV
ANDROID_HOME=/opt/android-sdk
ENV
PATH=${PATH}:${ANDROID_HOME}/tools/bin
RUN
(
while
sleep
1
;
do
echo
"y"
;
done
)
| sdkmanager
--update
# Android SDK libraries, NDK
ENV
ANDROID_DEPS=\
'build-tools;29.0.2 \
platforms;android-29 \
extras;android;m2repository \
extras;google;m2repository \
ndk;21.0.6113669'
RUN
(
while
sleep
1
;
do
echo
"y"
;
done
)
| sdkmanager
$ANDROID_DEPS
ENV
ANDROID_SDK=/opt/android-sdk
ENV
ANDROID_NDK=/opt/android-sdk/ndk/21.0.6113669
RUN
sdkmanager
--sdk_root
=
${
ANDROID_HOME
}
--update
RUN
(
while
sleep
1
;
do
echo
"y"
;
done
)
| sdkmanager
--sdk_root
=
${
ANDROID_HOME
}
'build-tools;29.0.3'
\
'platforms;android-29'
\
'extras;android;m2repository'
\
'extras;google;m2repository'
\
'ndk;21.1.6352462'
ENV
ANDROID_SDK=${ANDROID_HOME}
ENV
ANDROID_NDK=${ANDROID_HOME}/ndk/21.1.6352462
WORKDIR
/home/builder/src
VOLUME
/home/builder/src
This diff is collapsed.
Click to expand it.
ring-android/app/build.gradle
+
2
−
2
View file @
ef7f1b0e
...
...
@@ -4,8 +4,8 @@ def buildFirebase = project.hasProperty('buildFirebase') || getGradle().getStart
android
{
compileSdkVersion
29
buildToolsVersion
'29.0.
2
'
ndkVersion
"21.
0
.6
113669
"
buildToolsVersion
'29.0.
3
'
ndkVersion
"21.
1
.6
352462
"
defaultConfig
{
minSdkVersion
21
targetSdkVersion
29
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment