Author: Ryan Prichard
Date: 2024-07-22T15:30:31-07:00
New Revision: a1359f5ed446a2a6c5f87bfa938448b1016f9b12
URL: https://github.com/llvm/llvm-project/commit/a1359f5ed446a2a6c5f87bfa938448b1016f9b12
DIFF: https://github.com/llvm/llvm-project/commit/a1359f5ed446a2a6c5f87bfa938448b1016f9b12.diff
LOG: [libc++][Android] Pass -no-metrics to emulator (#99627)
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. ##
##############################################################################
```
Added:
Modified:
libcxx/utils/ci/vendor/android/Dockerfile.emulator
libcxx/utils/ci/vendor/android/emulator-entrypoint.sh
Removed:
################################################################################
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}"