shinano-common: Switch to standalone extract utils

Align with templates while we are at it

Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4

2 files changed, 32 insertions, 56 deletions

diff --git a/extract-files.sh b/extract-files.sh
index daffaaa..7139d6a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,46 +1,38 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
+
 function blob_fixup() {
     case "${1}" in
-    lib/hw/camera.vendor.qcom.so)
-        sed -i "s|com.sonyericsson.permission.CAMERA_EXTENDED|android.permission.CAMERA\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g" "${2}"
-        ;;
-    lib/libcameralight.so)
-        sed -i "s|/system/etc/flashled_calc_parameters.cfg|/vendor/etc/flashled_calc_parameters.cfg|g" "${2}"
-        ;;
-    vendor/bin/netmgrd)
-        sed -i "s|/system/etc/data/netmgr_config.xml|/vendor/etc/data/netmgr_config.xml|g" "${2}"
-        ;;
-    vendor/bin/qmuxd)
-        sed -i "s|/system/etc/data/qmi_config.xml|/vendor/etc/data/qmi_config.xml|g" "${2}"
-        ;;
-    vendor/lib/hw/audio.primary.msm8974.so)
-        sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
-        sed -i "s|/system/etc/sony_effect/|/vendor/etc/sony_effect/|g" "${2}"
-        sed -i "s|/system/etc/tfa98xx/|/vendor/etc/tfa98xx/|g" "${2}"
-        sed -i "s|/system/lib/soundfx/|/vendor/lib/soundfx/|g" "${2}"
-        ;;
-    vendor/lib/libaudioroute.so)
-        sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
-        ;;
-    vendor/lib/libdsi_netctrl.so)
-        sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}"
-        ;;
+        lib/hw/camera.vendor.qcom.so)
+            sed -i "s|com.sonyericsson.permission.CAMERA_EXTENDED|android.permission.CAMERA\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g" "${2}"
+            ;;
+        lib/libcameralight.so)
+            sed -i "s|/system/etc/flashled_calc_parameters.cfg|/vendor/etc/flashled_calc_parameters.cfg|g" "${2}"
+            ;;
+        vendor/bin/netmgrd)
+            sed -i "s|/system/etc/data/netmgr_config.xml|/vendor/etc/data/netmgr_config.xml|g" "${2}"
+            ;;
+        vendor/bin/qmuxd)
+            sed -i "s|/system/etc/data/qmi_config.xml|/vendor/etc/data/qmi_config.xml|g" "${2}"
+            ;;
+        vendor/lib/hw/audio.primary.msm8974.so)
+            sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
+            sed -i "s|/system/etc/sony_effect/|/vendor/etc/sony_effect/|g" "${2}"
+            sed -i "s|/system/etc/tfa98xx/|/vendor/etc/tfa98xx/|g" "${2}"
+            sed -i "s|/system/lib/soundfx/|/vendor/lib/soundfx/|g" "${2}"
+            ;;
+        vendor/lib/libaudioroute.so)
+            sed -i "s|/system/etc/mixer_paths.xml|/vendor/etc/mixer_paths.xml|g" "${2}"
+            ;;
+        vendor/lib/libdsi_netctrl.so)
+            sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}"
+            ;;
     esac
 }
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 5f107df..415869f 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,30 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) 2017-2019 The LineageOS Project
+# Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017-2020 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
+# SPDX-License-Identifier: Apache-2.0
 #
-#      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.
-#
-
-export DEVICE_PLATFORM_BARRIER="castor castor_windy sirius z3 z3c z3dual"
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
 
 set -e
 
 export DEVICE_PLATFORM="msm8974-common"
+export DEVICE_PLATFORM_BARRIER="castor castor_windy sirius z3 z3c z3dual"
 
 "./../../${VENDOR}/${DEVICE_PLATFORM}/setup-makefiles.sh" "$@"