From c0163027f33589e888136a2053062e597bca8202 Mon Sep 17 00:00:00 2001
From: Randall Barker <rbarker@mozilla.com>
Date: Tue, 12 Mar 2019 15:21:13 -0700
Subject: [PATCH] Fix Docker image path to zipalign

---
 .taskcluster.yml        | 6 +++---
 tools/docker/Dockerfile | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index c33588076..ce92c37ac 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -23,7 +23,7 @@ tasks:
           - pull_request.reopened
     payload:
       maxRunTime: 14400
-      image: 'mozillamixedreality/firefoxreality:190306'
+      image: 'mozillamixedreality/firefoxreality:190312'
       command:
         - /bin/bash
         - '--login'
@@ -60,7 +60,7 @@ tasks:
       - "secrets:get:project/firefoxreality/symbols-token"
     payload:
       maxRunTime: 14400
-      image: 'mozillamixedreality/firefoxreality:190306'
+      image: 'mozillamixedreality/firefoxreality:190312'
       features:
         taskclusterProxy: true
       command:
@@ -108,7 +108,7 @@ tasks:
       - "secrets:get:project/firefoxreality/symbols-token"
     payload:
       maxRunTime: 14400
-      image: 'mozillamixedreality/firefoxreality:190306'
+      image: 'mozillamixedreality/firefoxreality:190312'
       features:
         taskclusterProxy: true
       command:
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index c17d58618..7b60f3e6e 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -37,11 +37,12 @@ RUN cd /opt && wget -q https://dl.google.com/android/repository/sdk-tools-linux-
 RUN cd /opt && unzip android-sdk.zip
 RUN cd /opt && rm -f android-sdk.zip
 
+ENV ANDROID_BUILD_TOOLS_VERSION "28.0.3"
 ENV ANDROID_SDK_HOME /opt
 ENV ANDROID_HOME /opt
-ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools/bin:${ANDROID_SDK_HOME}/platform-tools:/opt/tools:${ANDROID_SDK_HOME}/build-tools/27.0.3
+ENV PATH ${PATH}:${ANDROID_SDK_HOME}/tools/bin:${ANDROID_SDK_HOME}/platform-tools:/opt/tools:${ANDROID_SDK_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}
 
-RUN echo y | sdkmanager "build-tools;28.0.3"
+RUN echo y | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
 RUN echo y | sdkmanager "ndk-bundle"
 RUN echo y | sdkmanager "cmake;3.10.2.4988404"
 RUN echo y | sdkmanager "platforms;android-28"