build: bump target sdk

Change-Id: I83290ec38c7704e174853244a9d8ddd4d132cad4

docker/Dockerfile

@@ -37,33 +37,29 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
 
 
-ENV ANDROID_DEPS=platform-tools,\
-build-tools-24.0.2,\
-android-24,\
-extra-android-support,\
-extra-android-m2repository,\
-extra-google-m2repository
+ENV ANDROID_DEPS='platform-tools build-tools;25.0.2 platforms;android-25 extras;android;m2repository extras;google;m2repository'
 
-# Android Linux SDK
+# Android Linux SDK tools
 # See http://developer.android.com/sdk/index.html
-RUN wget -O /tmp/android-sdk.tgz http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz && \
-	tar -C /opt/ -zxf /tmp/android-sdk.tgz && \
-	rm -f /tmp/android-sdk.tgz && \
-	chown -R root:root /opt/android-sdk-linux
+RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/tools_r25.2.3-linux.zip && \
+	mkdir -p /opt/android-sdk && \
+	unzip -d /opt/android-sdk /tmp/android-tools.zip && \
+	rm -f /tmp/android-tools.zip && \
+	chown -R root:root /opt/android-sdk
 
 # Android Linux NDK
 # See http://developer.android.com/tools/sdk/ndk/index.html
-RUN wget -O /tmp/android-ndk.zip http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip && \
+RUN wget -O /tmp/android-ndk.zip http://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip && \
 	unzip /tmp/android-ndk.zip -d /opt/ && \
 	rm -f /tmp/android-ndk.zip && \
-	chown -R root:root /opt/android-ndk-r12b
+	chown -R root:root /opt/android-ndk-r13b
 
 # Other tools and resources of Android SDK
-ENV ANDROID_HOME=/opt/android-sdk-linux
-ENV ANDROID_SDK=/opt/android-sdk-linux
-ENV ANDROID_NDK=/opt/android-ndk-r12b
-ENV PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-RUN echo y | android update sdk --filter ${ANDROID_DEPS} --all --no-ui --force
+ENV ANDROID_HOME=/opt/android-sdk
+ENV ANDROID_SDK=/opt/android-sdk
+ENV ANDROID_NDK=/opt/android-ndk-r13b
+ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
 
 WORKDIR /home/builder/src
 VOLUME /home/builder/src

ring-android/app/build.gradle

@@ -43,12 +43,12 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
     }
 
     sourceSets {