diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk
index d92c4673..6fb1a041 100644
--- a/build/target/product/AndroidProducts.mk
+++ b/build/target/product/AndroidProducts.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2018-2019 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,3 +19,9 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_arm64.mk \
     $(LOCAL_DIR)/lineage_x86.mk \
     $(LOCAL_DIR)/lineage_x86_64.mk
+
+COMMON_LUNCH_CHOICES := \
+    lineage_arm-userdebug \
+    lineage_arm64-userdebug \
+    lineage_x86-userdebug \
+    lineage_x86_64-userdebug