summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kaiser <gkaiser@google.com>2023-10-25 14:43:11 -0600
committerGreg Kaiser <gkaiser@google.com>2023-10-30 16:55:43 -0600
commitd14954014d2cce1f2649d80fafb417ef9d157804 (patch)
tree7d7fa8a35165213c89e33c5cdf3d901fe3ccb5d6
parent28d190d96fbdfc8894b86fdab4689d76d3c86326 (diff)
downloadcar-d14954014d2cce1f2649d80fafb417ef9d157804.tar.gz
Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 308429230 Test: lunch Merged-In: I59f0d19756f280ad71e3a0755a6c2ccc62f5060c Change-Id: I59f0d19756f280ad71e3a0755a6c2ccc62f5060c
-rw-r--r--AndroidProducts.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index a22521b..b32a963 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -26,13 +26,13 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/sdk_car_x86_64.mk \
COMMON_LUNCH_CHOICES := \
- car_ui_portrait-userdebug \
- car_x86_64-userdebug \
- gsi_car_arm64-userdebug \
- gsi_car_x86_64-userdebug \
- sdk_car_arm64-userdebug \
- sdk_car_md_x86_64-userdebug \
- sdk_car_portrait_x86_64-userdebug \
- sdk_car_x86_64-userdebug \
+ car_ui_portrait-trunk_staging-userdebug \
+ car_x86_64-trunk_staging-userdebug \
+ gsi_car_arm64-trunk_staging-userdebug \
+ gsi_car_x86_64-trunk_staging-userdebug \
+ sdk_car_arm64-trunk_staging-userdebug \
+ sdk_car_md_x86_64-trunk_staging-userdebug \
+ sdk_car_portrait_x86_64-trunk_staging-userdebug \
+ sdk_car_x86_64-trunk_staging-userdebug \
EMULATOR_VENDOR_NO_SOUND_TRIGGER := false