Cherry pick PR #1892: Remove --no-install-recommends and patcher from…

… Android Dockerfile (#2028) Refer to the original PR: #1892 This prevents circular dependency with ca-certificates and default-jdk during docker container build. b/308476033 --------- Co-authored-by: Igor Sarkisov <[email protected]>
youtube · Nov 29, 2023 · 33234a3 · 33234a3
1 parent 007628d
commit 33234a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 \
         g++-multilib \
@@ -52,7 +53,6 @@ RUN cd /tmp \
     "extras;android;m2repository" \
     "extras;google;m2repository" \
     "ndk;21.1.6352462" \
-    "patcher;v4" \
     "platforms;android-30" \
     "platforms;android-31" \
     "platform-tools" \