diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2020-12-28 10:34:04 +0000 |
|---|---|---|
| committer | Julian Veit <Claymore1298@gmail.com> | 2021-01-03 18:30:37 +0100 |
| commit | 5ab04d542f50f47d5e4c18a2d8f4e2e4d39b554d (patch) | |
| tree | 5071d2480467707e8ab5e054aee73e480c14d13d | |
| parent | a469dd035e7c1b2dba4fd380860caf21a7933a6d (diff) | |
m8-common: Align with extraction-utils templates
Change-Id: Ifbf18f79a1d0f173cb5b83bdf0178db2a5f1373e
| -rwxr-xr-x | extract-files.sh | 22 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 16 |
2 files changed, 12 insertions, 26 deletions
diff --git a/extract-files.sh b/extract-files.sh index fe6936c..25e988f 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,21 +1,17 @@ #!/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 # +# 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 function blob_fixup() { @@ -30,4 +26,4 @@ export BOARD_COMMON=msm8974-common export DEVICE_COMMON=m8-common export DEVICE_SPECIFIED_COMMON_DEVICE="m8 m8d" -./../$BOARD_COMMON/extract-files.sh $@ +"./../../${VENDOR}/${BOARD_COMMON}/extract-files.sh" "$@" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 38bdd9a..ca60e4c 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,19 +1,9 @@ #!/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 @@ -21,4 +11,4 @@ set -e export BOARD_COMMON=msm8974-common export DEVICE_COMMON_GUARDS="m8 m8d" -./../$BOARD_COMMON/setup-makefiles.sh $@ +"./../../${VENDOR}/${BOARD_COMMON}/setup-makefiles.sh" "$@" |