From dac4f861a3862612e5199eab9e3ca8c0ebd2f9c8 Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Thu, 26 Oct 2017 20:23:01 -0600
Subject: [PATCH] klte-common: Drop all of our releasetools stuff

* The OSS RIL gets us down to a single blob that we can instruct
  rild to make use of using a property. We've done that, so this
  has ceased to serve its purpose.

Revert "klte-common: releasetools: Use toybox's cp"

This reverts commit fbb95e0b011fe989031ba178b9467c24c45fca0d.

Revert "klte-common: releasetools: Move variant ident logic to hook"

This reverts commit 167e45f1c04c79eab5f13ef330bb93328e686bc6.

Revert "klte-common: Add releasetools extension to install variant blobs"

This reverts commit a27086acbaadfdae131bd67a29553c0a36c6b861.

Change-Id: I070d03063afc3d8bf12cbd70599600930b3edd47
---
 releasetools/releasetools.py  | 25 ---------------
 releasetools/variant_blobs.sh | 57 -----------------------------------
 2 files changed, 82 deletions(-)
 delete mode 100644 releasetools/releasetools.py
 delete mode 100644 releasetools/variant_blobs.sh

diff --git a/releasetools/releasetools.py b/releasetools/releasetools.py
deleted file mode 100644
index 79e053a..0000000
--- a/releasetools/releasetools.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2017 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-""" Custom OTA commands for klte devices """
-
-import common
-import re
-import os
-
-def FullOTA_InstallEnd(info):
-  info.script.Mount("/system")
-  info.script.AppendExtra('assert(run_program("/tmp/install/bin/variant_blobs.sh") == 0);')
-  info.script.Unmount("/system")
diff --git a/releasetools/variant_blobs.sh b/releasetools/variant_blobs.sh
deleted file mode 100644
index c60e395..0000000
--- a/releasetools/variant_blobs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/sh
-#
-# Copyright (C) 2017 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-copy()
-{
-  LD_LIBRARY_PATH=/system/lib /system/bin/toybox cp --preserve=a "$1" "$2"
-}
-
-VAR_SELECT_HOOK=/tmp/install/bin/variant_blobs_hook.sh
-
-# Detect variant and copy its specific-blobs
-BOOTLOADER=`getprop ro.bootloader`
-
-if [ -f $VAR_SELECT_HOOK ] ; then
-  . $VAR_SELECT_HOOK
-else
-  echo "Could not find variant selector hook: $VAR_SELECT_HOOK"
-  exit 1
-fi
-
-echo "Device with bootloader $BOOTLOADER requires $VARIANT blobs"
-
-BLOBBASE=/system/blobs/$VARIANT
-
-if [ -d $BLOBBASE ]; then
-  cd $BLOBBASE
-
-  for FILE in `find . -type f` ; do
-    mkdir -p `dirname /system/$FILE`
-    copy $FILE /system/$FILE
-  done
-
-  for FILE in bin/* ; do
-    chmod 755 /system/$FILE
-  done
-else
-  echo "Expected source directory does not exist!"
-  exit 1
-fi
-
-exit 0