From fd64f21cd6cb78fc0d025097d3fcd14464ce6821 Mon Sep 17 00:00:00 2001
From: "J. Avila" <elavila@google.com>
Date: Mon, 3 May 2021 22:20:15 +0000
Subject: [PATCH] Revert "build_slider: Add checking for compatibility with
 prebuilts"

This reverts commit 9343fc9ed1d0f4babbc932b7bb5638e5288bdc75. This patch
is causing difficult to diagnose TH issues and is blocking today's merge
from AOSP, so just revert it and figure out what's wrong later.

Signed-off-by: J. Avila <elavila@google.com>
Change-Id: I26bc2d4cd1f7dcc05efa6d17329554b56e7db579
---
 build_slider.sh | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/build_slider.sh b/build_slider.sh
index a7533d08f3d6..b6131dba4eab 100755
--- a/build_slider.sh
+++ b/build_slider.sh
@@ -50,12 +50,10 @@ GKI_PREBUILTS_DIR=$(readlink -m "prebuilts/boot-artifacts/kernel/")
 DEFAULT_CONFIG="private/gs-google/build.config.slider"
 DEVICE_KERNEL_BUILD_CONFIG=${DEVICE_KERNEL_BUILD_CONFIG:-${DEFAULT_CONFIG}}
 TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
-CHECK_DIRTY_AOSP=0
 if [ -z "${BUILD_KERNEL}" ]; then
   if [ "${EXPERIMENTAL_BUILD}" != "0" -o -n "${GKI_DEFCONFIG_FRAGMENT}" ]; then
     BUILD_KERNEL=1
   else
-    CHECK_DIRTY_AOSP=1
     BUILD_KERNEL=0
   fi
 fi
@@ -96,26 +94,6 @@ if [ "${BUILD_KERNEL}" = "0" ]; then
   fi
 fi
 
-# If BUILD_KERNEL is not explicitly set, be sure that there are no aosp/
-# changes not present in the prebuilt.
-if [ "${CHECK_DIRTY_AOSP}" != "0" ]; then
-  PREBUILTS_SHA=$(strings ${GKI_PREBUILTS_DIR}/vmlinux |
-		      grep "Linux version 5.10" |
-		      sed -n "s/^.*-g\([0-9a-f]\{12\}\)-.*/\1/p")
-  pushd aosp/ > /dev/null
-    # The AOSP sha can sometimes be longer than 12 characters; fix its length.
-    AOSP_SHA=$(git log -1 --abbrev=12 --pretty="format:%h")
-    if [ "${PREBUILTS_SHA}" != "${AOSP_SHA}" -o -n \
-         "$(git --no-optional-locks status -uno --porcelain ||
-            git diff-index --name-only HEAD)" ]; then
-      echo "There are changes in aosp/ which are not in the prebuilts."
-      echo "  Please set BUILD_KERNEL=1 if you wish to build these changes, or"
-      echo "  BUILD_KERNEL=0 if you wish to disregard them and use prebuilts."
-      exit_if_error 1 "aosp/ changes detected without BUILD_KERNEL set"
-    fi
-  popd > /dev/null
-fi
-
 if [ "${EXPERIMENTAL_BUILD}" = "0" -a "${BUILD_KERNEL}" != "0" ]; then
   pushd aosp/ > /dev/null
     # Booting AOSP ToT does not always work; throw a warning to prevent this.