Remove --wipe-data Issue #159105 Don't want users to remove user data image from the emualtor using -wipe-data flag. Defined here: https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/avd.py#143 Bug: 159105 Change-Id: I3f2872d62b98a28887ad22b2b3bd88e6bc7d2c86 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/61440 Reviewed-by: Reid Baker <reidbaker@google.com> Reviewed-by: Zach Anderson <zra@google.com> Commit-Queue: Reid Baker <reidbaker@google.com>
diff --git a/recipe_modules/android_virtual_device/api.py b/recipe_modules/android_virtual_device/api.py index 8bf4b13..e24cff3 100644 --- a/recipe_modules/android_virtual_device/api.py +++ b/recipe_modules/android_virtual_device/api.py
@@ -148,7 +148,6 @@ 'vpython3', avd_script_path, 'start', - '--wipe-data', '--debug-tags', 'all', '--avd-config',
diff --git a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json index ad51281..568f402 100644 --- a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json +++ b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_fails.json
@@ -276,7 +276,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -489,7 +488,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -702,7 +700,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json index a2e3dd8..881b3cd 100644 --- a/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json +++ b/recipe_modules/android_virtual_device/examples/emulator_start_retries.expected/setup_avd_pass_on_retry.json
@@ -276,7 +276,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -489,7 +488,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json index 8d96ef7..e2b2cf5 100644 --- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json +++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json index 8d96ef7..e2b2cf5 100644 --- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json +++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json index 118e593..30da27d 100644 --- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json +++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_start_fails.json
@@ -276,7 +276,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -415,7 +414,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -554,7 +552,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json index 8d96ef7..e2b2cf5 100644 --- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json +++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json index 8d96ef7..e2b2cf5 100644 --- a/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json +++ b/recipe_modules/android_virtual_device/examples/full_api_34.expected/emulator_started_and stopped_processes_killed.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json index 1c446ed..7cc16ab 100644 --- a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json +++ b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started and stopped, processes killed.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json index 1c446ed..7cc16ab 100644 --- a/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json +++ b/recipe_modules/android_virtual_device/examples/full_legacy_version.expected/emulator started.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json index 76ec3a1..6604a89 100644 --- a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json +++ b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started and stopped, processes killed.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json index 76ec3a1..6604a89 100644 --- a/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json +++ b/recipe_modules/android_virtual_device/examples/full_legacy_version_28.expected/emulator started.json
@@ -273,7 +273,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config", @@ -776,7 +775,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipes/devicelab/devicelab_drone.expected/emulator-test.json b/recipes/devicelab/devicelab_drone.expected/emulator-test.json index f70fd72..a533fd1 100644 --- a/recipes/devicelab/devicelab_drone.expected/emulator-test.json +++ b/recipes/devicelab/devicelab_drone.expected/emulator-test.json
@@ -676,7 +676,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",
diff --git a/recipes/packages/packages.expected/emulator-test.json b/recipes/packages/packages.expected/emulator-test.json index c789af1..f9fdb64 100644 --- a/recipes/packages/packages.expected/emulator-test.json +++ b/recipes/packages/packages.expected/emulator-test.json
@@ -832,7 +832,6 @@ "vpython3", "[CACHE]/avd/src/tools/android/avd/avd.py", "start", - "--wipe-data", "--debug-tags", "all", "--avd-config",