From f9d361ab763be30a56685efc85737d368b46e7b6 Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Tue, 10 Aug 2021 22:02:40 -0700 Subject: [PATCH] build_slider.sh: update branch android-gs-pixel-5.10 tracks AOSP android12-5.10 Signed-off-by: Petri Gynther Change-Id: I4f7c55dcbe1b56e9a09138dea0be4c7b81b3a45b --- build_slider.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_slider.sh b/build_slider.sh index 697e822ff7d4..617031b501c9 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-m2107) + LOCAL_MERGE_BASE=$(git merge-base HEAD aosp/android12-5.10) 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"