berlin: Sync extract scripts with templates

Change-Id: I98a36854c5a0c0390592911bb2558b34eff77efc
This commit is contained in:
Michael Bestas 2024-08-27 22:51:30 +03:00 committed by Nolen Johnson
parent b3005edddd
commit aabf1595fd
2 changed files with 24 additions and 6 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2016 The CyanogenMod Project # SPDX-FileCopyrightText: 2016 The CyanogenMod Project
# Copyright (C) 2017-2020 The LineageOS Project # SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -9,9 +9,19 @@
function blob_fixup() { function blob_fixup() {
case "${1}" in case "${1}" in
vendor/lib/libmot_chi_desktop_helper.so | vendor/lib64/libmot_chi_desktop_helper.so) vendor/lib/libmot_chi_desktop_helper.so | vendor/lib64/libmot_chi_desktop_helper.so)
[ "$2" = "" ] && return 0
grep -q "libgui_shim_vendor.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim_vendor.so" "${2}" grep -q "libgui_shim_vendor.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim_vendor.so" "${2}"
;; ;;
*)
return 1
;;
esac esac
return 0
}
function blob_fixup_dry() {
blob_fixup "$1" ""
} }
# If we're being sourced by the common script that we called, # If we're being sourced by the common script that we called,
@ -25,5 +35,6 @@ set -e
export DEVICE=berlin export DEVICE=berlin
export DEVICE_COMMON=sm7325-common export DEVICE_COMMON=sm7325-common
export VENDOR=motorola export VENDOR=motorola
export VENDOR_COMMON=${VENDOR}
"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" "./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@"

View File

@ -1,15 +1,22 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2016 The CyanogenMod Project # SPDX-FileCopyrightText: 2016 The CyanogenMod Project
# Copyright (C) 2017-2020 The LineageOS Project # SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
# #
# SPDX-License-Identifier: Apache-2.0 # 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 set -e
export DEVICE=berlin export DEVICE=berlin
export DEVICE_COMMON=sm7325-common export DEVICE_COMMON=sm7325-common
export VENDOR=motorola export VENDOR=motorola
export VENDOR_COMMON=${VENDOR}
"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" "./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"