SDK tools, Platform Tools and Emulator versions added to system_report.sh

CHANGELOG.md

@@ -1,3 +1,8 @@
+## `v2017_07_13_1`
+
+* SDK tools, Platform Tools and Emulator versions added to `system_report.sh` : https://github.com/bitrise-docker/android/pull/96
+* new preinstalled package: `emulator`
+
 ## `v2017_07_12_1`
 
 * SDK tools updated to 26.0.2 : https://github.com/bitrise-docker/android/pull/95

Dockerfile

@@ -44,6 +44,9 @@ RUN echo 8933bad161af4178b1185d1a37fbf41ea5269c55 > ${ANDROID_HOME}/licenses/and
 # Platform tools
 RUN sdkmanager "platform-tools"
 
+# Emulator
+RUN sdkmanager "emulator"
+
 # SDKs
 # Please keep these in descending order!
 RUN sdkmanager "platforms;android-26"
@@ -166,5 +169,5 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ANDROID_HOME}/tools/lib64
 # Cleaning
 RUN apt-get clean
 
-ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_06_10_1
+ENV BITRISE_DOCKER_REV_NUMBER_ANDROID v2017_07_13_1
 CMD bitrise -version

system_report.sh

@@ -61,6 +61,16 @@ which adb
 echo
 echo " * adb version:"
 adb version
+echo
+echo " * SDK packages:"
+if [[ ! -z "${BITRISE_DOCKER_REV_NUMBER_ANDROID_NDK_LTS}" ]] ; then
+    echo " (!) Version check not available on this Stack / in this image"
+else
+    grep ^Pkg.Revision ${ANDROID_HOME}/tools/source.properties | cut -d= -f 2 | xargs -I {} echo "* SDK Tools version: {}"
+    grep ^Pkg.Revision ${ANDROID_HOME}/platform-tools/source.properties | cut -d= -f 2 | xargs -I {} echo "* Platform Tools version: {}"
+    grep ^Pkg.Revision ${ANDROID_HOME}/emulator/source.properties | cut -d= -f 2 | xargs -I {} echo "* Emulator version: {}"
+fi
+
 echo "========================================"
 echo