Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick PR #1892: Remove --no-install-recommends and patcher from Android Dockerfile #2028

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Cherry pick PR #1892: Remove --no-install-recommends and patcher from Android Dockerfile #2028

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dc104
Remove --no-install-recommends and patcher from Android Dockerfile (#…
isarkis Nov 6, 2023
043f664
Resolve merge conflict.
isarkis Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/linux/android/Dockerfile
View file
Open in desktop
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 \
g++-multilib \
Expand Down Expand Up @@ -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" \
Expand Down
Loading