@@ -15,9 +15,8 @@ ENV DOCKER_ANDROID_DISPLAY_NAME mobileci-docker
15
15
ENV DEBIAN_FRONTEND noninteractive
16
16
17
17
# Updating & Installing packages
18
- RUN apt-get update \
19
- && apt-get dist-upgrade -y \
20
- && apt-get install -y \
18
+ RUN apt-get update && apt-get install -y \
19
+ wget \
21
20
autoconf \
22
21
build-essential \
23
22
bzip2 \
@@ -59,14 +58,12 @@ RUN apt-add-repository ppa:openjdk-r/ppa \
59
58
# Environment variables
60
59
ENV ANDROID_HOME /usr/local/android-sdk
61
60
ENV ANDROID_SDK_HOME $ANDROID_HOME
62
- ENV ANDROID_NDK_HOME /usr/local/android-ndk
63
61
ENV JENKINS_HOME $HOME
64
62
ENV PATH ${INFER_HOME}/bin:${PATH}
65
63
ENV PATH $PATH:$ANDROID_SDK_HOME/tools
66
64
ENV PATH $PATH:$ANDROID_SDK_HOME/platform-tools
67
65
ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools/23.0.2
68
66
ENV PATH $PATH:$ANDROID_SDK_HOME/build-tools/24.0.0
69
- ENV PATH $PATH:$ANDROID_NDK_HOME
70
67
71
68
# Export JAVA_HOME variable
72
69
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
@@ -96,14 +93,6 @@ RUN echo y | /usr/local/android-sdk/tools/android update sdk --filter "${ANDROID
96
93
&& chown -R $RUN_USER:$RUN_USER $ANDROID_HOME \
97
94
&& chmod -R a+rx $ANDROID_HOME
98
95
99
- # Install Android NDK
100
- RUN wget http://dl.google.com/android/repository/android-ndk-r12-linux-x86_64.zip \
101
- && unzip android-ndk-r12-linux-x86_64.zip \
102
- && mv android-ndk-r12 /usr/local/android-ndk \
103
- && chown -R $RUN_USER:$RUN_USER $ANDROID_NDK_HOME \
104
- && chmod -R a+rx $ANDROID_NDK_HOME \
105
- && rm android-ndk-r12-linux-x86_64.zip
106
-
107
96
# Support Gradle
108
97
ENV TERM dumb
109
98
ENV JAVA_OPTS "-Xms4096m -Xmx4096m"
@@ -117,4 +106,4 @@ RUN chown -R $RUN_USER:$RUN_USER $PROJECT
117
106
WORKDIR $PROJECT
118
107
119
108
USER $RUN_USER
120
- RUN echo "sdk.dir=$ANDROID_HOME" > local.properties
109
+ RUN echo "sdk.dir=$ANDROID_HOME" > local.properties
0 commit comments