Skip to content

Commit

Permalink
build_slider.sh: update branch
Browse files Browse the repository at this point in the history
android-gs-pixel-5.10 tracks AOSP android12-5.10

Signed-off-by: Petri Gynther <[email protected]>
Change-Id: I4f7c55dcbe1b56e9a09138dea0be4c7b81b3a45b
  • Loading branch information
Petri Gynther committed Aug 11, 2021
1 parent 57bf474 commit f9d361a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build_slider.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f9d361a

Please sign in to comment.