From c4e5bc3fce4c4d2c88192e9b60a116c53ed952a8 Mon Sep 17 00:00:00 2001
From: "J. Avila" <elavila@google.com>
Date: Tue, 27 Jul 2021 23:27:38 +0000
Subject: [PATCH] build_slider: Check aosp/ dir against android12-5.10-m2107

As we move to taking -release images, the aosp/ directory is being set
to a SHA from android12-5.10-m2107. Update the aosp/ vs manifest check
to reflect that.

Bug: 194513402
Signed-off-by: J. Avila <elavila@google.com>
Change-Id: I607bef03950158af46a2edd0d6dc0709a943e99f
---
 build_slider.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_slider.sh b/build_slider.sh
index 617031b501c9..697e822ff7d4 100755
--- a/build_slider.sh
+++ b/build_slider.sh
@@ -70,7 +70,7 @@ if [ "${EXPERIMENTAL_BUILD}" = "0" -a "${BUILD_KERNEL}" != "0" ]; then
 		     sed -n "s/^.*revision=\"\([0-9a-fA-F]*\)\".*/\1/p")
   pushd aosp/ > /dev/null
     # Booting AOSP ToT does not always work; throw a warning to prevent this.
-    LOCAL_MERGE_BASE=$(git merge-base HEAD aosp/android12-5.10)
+    LOCAL_MERGE_BASE=$(git merge-base HEAD aosp/android12-5.10-m2107)
     if [ -n "${LOCAL_MERGE_BASE}" -a \
             "${MANIFEST_SHA}" != "${LOCAL_MERGE_BASE}" ]; then
       echo "Your aosp/ directory appears to be synced to a point beyond the"