Skip to content

[libc++][Android] Pass -no-metrics to emulator #99627

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

Merged
rprichard merged 1 commit into from
Jul 22, 2024
Merged

[libc++][Android] Pass -no-metrics to emulator #99627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion libcxx/utils/ci/vendor/android/Dockerfile.emulator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
unzip \
&& rm -rf /var/lib/apt/lists/*

ENV ANDROID_HOME /opt/android/sdk
ENV ANDROID_HOME=/opt/android/sdk
Copy link
Member

@mordante mordante Jul 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't test the Dockerfile changes in our CI. Did you verify this works correctly?

Copy link
Contributor Author

@rprichard rprichard Jul 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I tested it by running run-buildbot android-ndk-33-goog-x86_64 inside vendor/android/run-buildbot-container. To do that, I first needed to apply #99623 and comment out the broken LLVM-16-on-noble step, as explained on that PR.


RUN curl -sL https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip && \
mkdir -p ${ANDROID_HOME} && \
Expand Down
2 changes: 1 addition & 1 deletion libcxx/utils/ci/vendor/android/emulator-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ fi

# Use exec so that the emulator is PID 1, so that `docker stop` kills the
# emulator.
exec emulator @emulator -no-audio -no-window \
exec emulator @emulator -no-audio -no-window -no-metrics \
-partition-size "${EMU_PARTITION_SIZE}"