commit 29190f5b9658dd65fcf076c7c5f131f95a8aa230
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jan 06 17:46:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 06 17:46:25 2024 +0000
tree 814900af7919e87dc071eca7fb80d85a2cd2f369
parent 5fde6b741dd64e77d2aed31af98c7736af54064c
parent a8becbc1441d1ec9fb21105b23d3ea29a62b53c0

Merge "Change default lunch target" into main am: a8becbc144

Original change: https://android-review.googlesource.com/c/platform/build/+/2898150

Change-Id: I43ea24edc8ab4484d1af20b958392ee2dc770f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 212ed9f..c0bd9e3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -775,7 +775,7 @@
         answer=$1
     else
         print_lunch_menu
-        echo "Which would you like? [aosp_arm-trunk_staging-eng]"
+        echo "Which would you like? [aosp_cf_x86_64_phone-trunk_staging-eng]"
         echo -n "Pick from common choices above (e.g. 13) or specify your own (e.g. aosp_barbet-trunk_staging-eng): "
         read answer
         used_lunch_menu=1
@@ -785,7 +785,7 @@
 
     if [ -z "$answer" ]
     then
-        selection=aosp_arm-trunk_staging-eng
+        selection=aosp_cf_x86_64_phone-trunk_staging-eng
     elif (echo -n $answer | grep -q -e "^[0-9][0-9]*$")
     then
         local choices=($(TARGET_BUILD_APPS= get_build_var COMMON_LUNCH_CHOICES))