aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2020-12-19 02:53:35 +0200
committerTony Jose <gmoto1179@gmail.com>2021-01-19 22:12:15 +0530
commit44891ae77f328ba6baf6041365e334eab7c840f1 (patch)
treec5c3f267c3d1c18a17ff4adf75bbc9837ca9efdc
parent88f241fa78e2e6b24cdb32e939ee40c7b365980c (diff)
merlin: Switch to standalone extract utils
Align with templates while we are at it Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4
-rwxr-xr-xextract-files.sh15
-rwxr-xr-xsetup-makefiles.sh18
2 files changed, 6 insertions, 27 deletions
diff --git a/extract-files.sh b/extract-files.sh
index f21a4f6..46ebbe4 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,18 +1,9 @@
#!/bin/bash
#
# 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
@@ -22,4 +13,4 @@ export DEVICE=merlin
export DEVICE_COMMON=msm8916-common
export VENDOR=motorola
-./../../$VENDOR/$DEVICE_COMMON/extract-files.sh $@
+"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index c8558db..eb553ac 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,28 +1,16 @@
#!/bin/bash
#
# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS 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
-export DEVICE_BRINGUP_YEAR=2016
-
# Required!
export DEVICE=merlin
export DEVICE_COMMON=msm8916-common
export VENDOR=motorola
-./../../$VENDOR/$DEVICE_COMMON/setup-makefiles.sh $@
+"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"