From 73350bc4b4aa7548b1f8f44161c03a7f45bfe9ce Mon Sep 17 00:00:00 2001
From: cobalt-github-releaser-bot
 <95661244+cobalt-github-releaser-bot@users.noreply.github.com>
Date: Sat, 13 Apr 2024 15:25:26 -0700
Subject: [PATCH] Cherry pick PR #1892: Remove --no-install-recommends and
 patcher from Android Dockerfile (#2932)

Refer to the original PR: https://github.com/youtube/cobalt/pull/1892

This prevents circular dependency with ca-certificates and default-jdk
during docker container build.

b/308476033

Co-authored-by: Igor Sarkisov <isarkisov@google.com>
---
 docker/linux/android/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/linux/android/Dockerfile b/docker/linux/android/Dockerfile
index 0a949a943956..5d0d1531de74 100644
--- a/docker/linux/android/Dockerfile
+++ b/docker/linux/android/Dockerfile
@@ -14,8 +14,9 @@
 
 FROM cobalt-build-base
 
+# TODO: b/309157124 - add --no-install-recommends.
 RUN apt update -qqy \
-    && apt install -qqy --no-install-recommends \
+    && apt install -qqy \
         libxml2-dev \
         default-jdk \
         binutils-arm-linux-gnueabi \
@@ -53,7 +54,6 @@ RUN cd /tmp \
     "extras;android;m2repository" \
     "extras;google;m2repository" \
     "ndk;25.2.9519653" \
-    "patcher;v4" \
     "platforms;android-30" \
     "platforms;android-31" \
     "platform-tools" \