From 65bc599f1658a0ec4f1678a9da25c1ecea9bca7e Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 28 Aug 2019 09:00:31 -0700
Subject: [PATCH] Remove android build dependency on jherico/hifi fork

---
 android/docker/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 105bcb7cb0..f6c0e7b2e5 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -71,9 +71,13 @@ RUN mkdir "$HIFI_BASE" && \
     mkdir "$HIFI_VCPKG_BASE" && \ 
     mkdir "$HIFI_ANDROID_PRECOMPILED"
 
-RUN git clone https://github.com/jherico/hifi.git && \
+# Checkout a relatively recent commit from the main repository and use it to cache the 
+# gradle and vcpkg dependencies
+# This commit ID should be updated whenever someone changes the dependency list
+# in cmake/ports
+RUN git clone https://github.com/highfidelity/hifi.git && \
     cd ~/hifi && \
-    git checkout quest/build
+    git checkout 796bfb5d6715ff14c2e60f3ee8fac1465b7578c6
 
 WORKDIR /home/jenkins/hifi