From eb72796ab8906b5518825b69bccd62f039662da3 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Tue, 28 Feb 2017 15:27:20 -0800
Subject: Update android version in Docker. Change: 148823878

---
 WORKSPACE                                    |  2 +-
 tensorflow/tools/ci_build/Dockerfile.android | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index c8aca38839..162b9b43bc 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -25,7 +25,7 @@ check_version("0.4.2")
 #android_sdk_repository(
 #    name = "androidsdk",
 #    api_level = 23,
-#    build_tools_version = "23.0.1",
+#    build_tools_version = "25.0.1",
 #    # Replace with path to Android SDK on your system
 #    path = "<PATH_TO_SDK>",
 #)
diff --git a/tensorflow/tools/ci_build/Dockerfile.android b/tensorflow/tools/ci_build/Dockerfile.android
index 031f8e8255..887589bc93 100644
--- a/tensorflow/tools/ci_build/Dockerfile.android
+++ b/tensorflow/tools/ci_build/Dockerfile.android
@@ -15,11 +15,8 @@ COPY install/.bazelrc /root/.bazelrc
 ENV BAZELRC /root/.bazelrc
 
 # Install extra libraries for android sdk.
-# (see http://stackoverflow.com/questions/33427893/can-not-run-android-sdk-build-tools-23-0-2-aapt)
 RUN apt-get update && apt-get install -y \
         python-numpy \
-        lib32stdc++6 \
-        lib32z1 \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
@@ -30,15 +27,15 @@ ENV ANDROID_DEV_HOME /android
 RUN mkdir -p ${ANDROID_DEV_HOME}
 
 # Install Android SDK.
-ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz
-ENV ANDROID_SDK_URL http://dl.google.com/android/${ANDROID_SDK_FILENAME}
+ENV ANDROID_SDK_FILENAME tools_r25.2.5-linux.zip
+ENV ANDROID_SDK_URL https://dl.google.com/android/repository/${ANDROID_SDK_FILENAME}
 ENV ANDROID_API_LEVEL 23
-ENV ANDROID_BUILD_TOOLS_VERSION 23.0.2
+ENV ANDROID_BUILD_TOOLS_VERSION 25.0.1
 ENV ANDROID_SDK_HOME ${ANDROID_DEV_HOME}/sdk
 ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools
 RUN cd ${ANDROID_DEV_HOME} && \
     wget -q ${ANDROID_SDK_URL} && \
-    tar -xzf ${ANDROID_SDK_FILENAME} && \
+    unzip ${ANDROID_SDK_FILENAME} -d android-sdk-linux && \
     rm ${ANDROID_SDK_FILENAME} && \
     bash -c "ln -s ${ANDROID_DEV_HOME}/android-sdk-* ${ANDROID_SDK_HOME}" && \
     echo y | android update sdk --no-ui -a --filter tools,platform-tools,android-${ANDROID_API_LEVEL},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
-- 
cgit v1.2.3