BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm845-common: Sync extractors with templates

Browse source 
* This introduces fixup scripts and kang mode and fixes
   passing of arguments longer than one word,
   such as --section "Hello world".

Change-Id: I42dde659e9bea4f7e1c9a7a3fa8da3243774ca4e
This commit is contained in:
Vladimir Oltean 2019-03-22 22:37:05 +00:00 committed by LuK1337
parent e3b8016ded
commit 164090d2d3
2 changed files with 51 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
extract-files.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -19,48 +19,59 @@ set -e
# Load extract_utils and do some sanity checks # Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}" MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
LINEAGE_ROOT="$MY_DIR"/../../.. LINEAGE_ROOT="${MY_DIR}"/../../..
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
if [ ! -f "$HELPER" ]; then if [ ! -f "${HELPER}" ]; then
echo "Unable to find helper script at $HELPER" echo "Unable to find helper script at ${HELPER}"
exit 1 exit 1
fi fi
. "$HELPER" source "${HELPER}"
# Default to sanitizing the vendor folder before extraction # Default to sanitizing the vendor folder before extraction
CLEAN_VENDOR=true CLEAN_VENDOR=true
while [ "$1" != "" ]; do SECTION=
case $1 in KANG=
-n | --no-cleanup ) CLEAN_VENDOR=false
;; while [ "${#}" -gt 0 ]; do
-s | --section ) shift case "${1}" in
SECTION=$1 -n | --no-cleanup )
CLEAN_VENDOR=false CLEAN_VENDOR=false
;; ;;
* ) SRC=$1 -k | --kang )
;; KANG="--kang"
;;
-s | --section )
SECTION="${2}"; shift
CLEAN_VENDOR=false
;;
* )
SRC="${1}"
;;
esac esac
shift shift
done done
if [ -z "$SRC" ]; then if [ -z "${SRC}" ]; then
SRC=adb SRC="adb"
fi fi
# Initialize the helper for common device # Initialize the helper for common device
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"
extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION" extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
"${KANG}" --section "${SECTION}"
if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
# Reinitialize the helper for device # Reinitialize the helper for device
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR" source "${MY_DIR}/../${DEVICE}/extract-files.sh"
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}"
extract "$MY_DIR"/../$DEVICE/proprietary-files.txt "$SRC" "$SECTION" extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \
"${KANG}" --section "${SECTION}"
fi fi
"$MY_DIR"/setup-makefiles.sh "${MY_DIR}/setup-makefiles.sh"

29
setup-makefiles.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2018 The LineageOS Project # Copyright (C) 2018-2019 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -19,39 +19,40 @@ set -e
# Load extract_utils and do some sanity checks # Load extract_utils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}" MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
LINEAGE_ROOT="$MY_DIR"/../../.. LINEAGE_ROOT="${MY_DIR}/../../.."
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
if [ ! -f "$HELPER" ]; then if [ ! -f "${HELPER}" ]; then
echo "Unable to find helper script at $HELPER" echo "Unable to find helper script at ${HELPER}"
exit 1 exit 1
fi fi
. "$HELPER" source "${HELPER}"
# Initialize the helper for common # Initialize the helper for common
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
# Copyright headers and guards # Copyright headers and guards
write_headers "enchilada fajita" write_headers "enchilada fajita"
# The standard common blobs # The standard common blobs
write_makefiles "$MY_DIR"/proprietary-files.txt true write_makefiles "${MY_DIR}/proprietary-files.txt" true
# We are done! # Finish
write_footers write_footers
if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
# Reinitialize the helper for device # Reinitialize the helper for device
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false
# Copyright headers and guards # Copyright headers and guards
write_headers write_headers
# The standard device blobs # The standard device blobs
write_makefiles "$MY_DIR"/../$DEVICE/proprietary-files.txt true write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true
# We are done! # Finish
write_footers write_footers
fi fi