[libc++][Android] Pass -no-metrics to emulator #99627
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Android Emulator has started printing this message, so pass the option: ``` ############################################################################## ## WARNING - ACTION REQUIRED ## ## Consider using the '-metrics-collection' flag to help improve the ## ## emulator by sending anonymized usage data. Or use the '-no-metrics' ## ## flag to bypass this warning and turn off the metrics collection. ## ## In a future release this warning will turn into a one-time blocking ## ## prompt to ask for explicit user input regarding metrics collection. ## ## ## ## Please see '-help-metrics-collection' for more details. You can use ## ## '-metrics-to-file' or '-metrics-to-console' flags to see what type of ## ## data is being collected by emulator as part of usage statistics. ## ############################################################################## ```
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Ryan Prichard (rprichard) ChangesThe Android Emulator has started printing this message, so pass the Full diff: https://github.com/llvm/llvm-project/pull/99627.diff 2 Files Affected:
diff --git a/libcxx/utils/ci/vendor/android/Dockerfile.emulator b/libcxx/utils/ci/vendor/android/Dockerfile.emulator
index 54953f40014e7..2f52b27f6edcd 100644
--- a/libcxx/utils/ci/vendor/android/Dockerfile.emulator
+++ b/libcxx/utils/ci/vendor/android/Dockerfile.emulator
@@ -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
RUN curl -sL https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -o cmdline-tools.zip && \
mkdir -p ${ANDROID_HOME} && \
diff --git a/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh b/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh
index e4538697266a4..99d4995b2ee1d 100755
--- a/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh
+++ b/libcxx/utils/ci/vendor/android/emulator-entrypoint.sh
@@ -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}"
|
mordante
approved these changes
Jul 20, 2024
| @@ -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 | |||
There was a problem hiding this comment.
We don't test the Dockerfile changes in our CI. Did you verify this works correctly?
There was a problem hiding this comment.
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.
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
Summary: The Android Emulator has started printing this message, so pass the `-no-metrics` option: ``` ############################################################################## ## WARNING - ACTION REQUIRED ## ## Consider using the '-metrics-collection' flag to help improve the ## ## emulator by sending anonymized usage data. Or use the '-no-metrics' ## ## flag to bypass this warning and turn off the metrics collection. ## ## In a future release this warning will turn into a one-time blocking ## ## prompt to ask for explicit user input regarding metrics collection. ## ## ## ## Please see '-help-metrics-collection' for more details. You can use ## ## '-metrics-to-file' or '-metrics-to-console' flags to see what type of ## ## data is being collected by emulator as part of usage statistics. ## ############################################################################## ``` Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60251061
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Android Emulator has started printing this message, so pass the
-no-metricsoption: