Skip to content

Commit

Permalink
Cherry pick PR #1892: Remove --no-install-recommends and patcher from…
Browse files Browse the repository at this point in the history
… Android Dockerfile (#2932)

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]>
  • Loading branch information
cobalt-github-releaser-bot and isarkis committed Apr 13, 2024
1 parent d214884 commit 73350bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker/linux/android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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" \
Expand Down

0 comments on commit 73350bc

Please sign in to comment.