build_slider: Remove obsolete merge point check

Before the KMI freeze, there was a concern that developers would encounter boot or compile time issues when trying to check out their aosp/ directory beyond the current merge point. This is less of an issue now, and this check has been confusing for some, so we can go ahead and remove it. Signed-off-by: J. Avila <[email protected]> Change-Id: I83ee7d43aebfdd97cb8dcb9c11c665ff367b8b79
celtare21 · Sep 14, 2021 · 34ae007 · 34ae007
1 parent 0bdfef4
commit 34ae007
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/build_slider.sh b/build_slider.sh
@@ -65,23 +65,6 @@ if [ "${BUILD_KERNEL}" = "0" ]; then
   fi
 fi
 
-if [ "${EXPERIMENTAL_BUILD}" = "0" -a "${BUILD_KERNEL}" != "0" ]; then
-  MANIFEST_SHA=$(cat .repo/manifests/default.xml | grep "path=\"aosp\"" |
-		     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-2021-09)
-    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"
-      echo "  latest AOSP merge point. This is not supported, currently, as"
-      echo "  it is prone to errors. Please base any changes on the latest"
-      echo "  merge point as specified in the manifest."
-      exit_if_error 1 "aosp/ is not based on latest merge point"
-    fi
-  popd > /dev/null
-fi
-
 # These are for build.sh, so they should be exported.
 export LTO
 export KMI_SYMBOL_LIST_STRICT_MODE