evert: Switch to standalone extract utils

* Align with templates while we are at it

Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4

2 files changed, 10 insertions, 37 deletions

diff --git a/extract-files.sh b/extract-files.sh
index ad2cfee..9d52a5f 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,33 +1,21 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-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
-
-        # Load ZAF configs from vendor
-        vendor/lib/libzaf_core.so)
-            sed -i "s|/system/etc/zaf|/vendor/etc/zaf|g" "${2}"
-            ;;
-
         # Add uhid group for fingerprint service
         vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc)
             sed -i "s/input/uhid input/" "${2}"
             ;;
-
+        # Load ZAF configs from vendor
+        vendor/lib/libzaf_core.so)
+            sed -i "s|/system/etc/zaf|/vendor/etc/zaf|g" "${2}"
+            ;;
     esac
 }
 
@@ -39,11 +27,8 @@ fi
 
 set -e
 
-# Required!
 export DEVICE=evert
 export DEVICE_COMMON=sdm660-common
 export VENDOR=motorola
 
-export DEVICE_BRINGUP_YEAR=2018
-
 "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index ba46ecf..b8e061b 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,27 +1,15 @@
 #!/bin/bash
 #
-# Copyright (C) 2018-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
 #
 
 set -e
 
-# Required!
 export DEVICE=evert
 export DEVICE_COMMON=sdm660-common
 export VENDOR=motorola
 
-export DEVICE_BRINGUP_YEAR=2018
-
 "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"