Merge "Fix lunch choices for git_main" into main am: 3d79e54ff1 am: bf665a1fa6

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

Change-Id: Ibdb553e1c9e63a60b69d7b7c8e8a796d90bc1c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-25 23:17:20 +00:00
committed by Automerger Merge Worker

View File

@@ -84,7 +84,7 @@ PRODUCT_MAKEFILES += \
$(LOCAL_DIR)/module_x86_64only.mk \
COMMON_LUNCH_CHOICES := \
aosp_arm64-eng \
aosp_arm-eng \
aosp_x86_64-eng \
aosp_x86-eng \
aosp_arm64-trunk_staging-eng \
aosp_arm-trunk_staging-eng \
aosp_x86_64-trunk_staging-eng \
aosp_x86-trunk_staging-eng \