summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kaiser <gkaiser@google.com>2023-10-31 00:38:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-31 00:38:58 +0000
commiteca436aaf107117e6bc95cdb6e18d5ce5331b975 (patch)
treed10f82b46f68bfd12992a4b95a4b2daaae99a15f
parent4a58da77b6eea1d794a3b27191794ecc2a5fe941 (diff)
parent84c58b5290574b7f7b1626be0d1f275dfde19279 (diff)
downloadart-eca436aaf107117e6bc95cdb6e18d5ce5331b975.tar.gz
Fix lunch choices for git_main am: cff9d02a9c am: 84c58b5290
Original change: https://android-review.googlesource.com/c/device/generic/art/+/2811333 Change-Id: I06d15a6d151a50f915353682e7426544aeef1ab8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--arm_krait/AndroidProducts.mk2
-rw-r--r--arm_v7_v8/AndroidProducts.mk2
-rw-r--r--armv8/AndroidProducts.mk2
-rw-r--r--armv8_cortex_a55/AndroidProducts.mk2
-rw-r--r--armv8_kryo385/AndroidProducts.mk2
-rw-r--r--riscv64/AndroidProducts.mk2
-rw-r--r--silvermont/AndroidProducts.mk2
7 files changed, 7 insertions, 7 deletions
diff --git a/arm_krait/AndroidProducts.mk b/arm_krait/AndroidProducts.mk
index 91934dd..8c0d38f 100644
--- a/arm_krait/AndroidProducts.mk
+++ b/arm_krait/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/arm_krait.mk
COMMON_LUNCH_CHOICES := \
- arm_krait-eng
+ arm_krait-trunk_staging-eng
diff --git a/arm_v7_v8/AndroidProducts.mk b/arm_v7_v8/AndroidProducts.mk
index 7d6a244..04819ca 100644
--- a/arm_v7_v8/AndroidProducts.mk
+++ b/arm_v7_v8/AndroidProducts.mk
@@ -21,4 +21,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/arm_v7_v8.mk
COMMON_LUNCH_CHOICES := \
- arm_v7_v8-eng
+ arm_v7_v8-trunk_staging-eng
diff --git a/armv8/AndroidProducts.mk b/armv8/AndroidProducts.mk
index a2327e4..410545e 100644
--- a/armv8/AndroidProducts.mk
+++ b/armv8/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/armv8.mk
COMMON_LUNCH_CHOICES := \
- armv8-eng
+ armv8-trunk_staging-eng
diff --git a/armv8_cortex_a55/AndroidProducts.mk b/armv8_cortex_a55/AndroidProducts.mk
index 7275325..d9b807d 100644
--- a/armv8_cortex_a55/AndroidProducts.mk
+++ b/armv8_cortex_a55/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/armv8_cortex_a55.mk
COMMON_LUNCH_CHOICES := \
- armv8_cortex_a55-eng
+ armv8_cortex_a55-trunk_staging-eng
diff --git a/armv8_kryo385/AndroidProducts.mk b/armv8_kryo385/AndroidProducts.mk
index 1cfc959..c19d5ed 100644
--- a/armv8_kryo385/AndroidProducts.mk
+++ b/armv8_kryo385/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/armv8_kryo385.mk
COMMON_LUNCH_CHOICES := \
- armv8_kryo385-eng
+ armv8_kryo385-trunk_staging-eng
diff --git a/riscv64/AndroidProducts.mk b/riscv64/AndroidProducts.mk
index 995ad74..ffaaadb 100644
--- a/riscv64/AndroidProducts.mk
+++ b/riscv64/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/riscv64.mk
COMMON_LUNCH_CHOICES := \
- riscv64-eng
+ riscv64-trunk_staging-eng
diff --git a/silvermont/AndroidProducts.mk b/silvermont/AndroidProducts.mk
index 9fa0864..f3f53dc 100644
--- a/silvermont/AndroidProducts.mk
+++ b/silvermont/AndroidProducts.mk
@@ -18,4 +18,4 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/silvermont.mk \
COMMON_LUNCH_CHOICES := \
- silvermont-eng
+ silvermont-trunk_staging-eng