matisse-common: Switch to standalone extract utils
* Align with templates while we are at it Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4
This commit is contained in:
Michael Bestas
matteo0026
parent
20622f50e1
commit
d622923f40
|
|
@ -1,66 +1,39 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2016 The CyanogenMod Project
|
||||
# Copyright (C) 2017 The LineageOS Project
|
||||
# Copyright (C) 2017-2021 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
|
||||
|
||||
if [ -z "${DEVICE_COMMON}" ]; then
|
||||
echo ""
|
||||
echo "error: This is a script in a common tree. Please execute" $(basename $0) "from a device tree."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Load extract_utils and do some sanity checks
|
||||
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}/../../.."
|
||||
ANDROID_ROOT="${MY_DIR}/../../.."
|
||||
|
||||
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
|
||||
HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
|
||||
if [ ! -f "${HELPER}" ]; then
|
||||
echo "Unable to find helper script at ${HELPER}"
|
||||
exit 1
|
||||
fi
|
||||
. "${HELPER}"
|
||||
source "${HELPER}"
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
SRC=adb
|
||||
else
|
||||
if [ $# -eq 1 ]; then
|
||||
SRC="${1}"
|
||||
else
|
||||
echo "$0: bad number of arguments"
|
||||
echo ""
|
||||
echo "usage: $0 [PATH_TO_EXPANDED_ROM]"
|
||||
echo ""
|
||||
echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from"
|
||||
echo "the device using adb pull."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
|
||||
|
||||
# Initialize the helper for common device
|
||||
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
|
||||
|
||||
extract "${MY_DIR}/common-proprietary-files.txt" "${SRC}"
|
||||
|
||||
COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary"
|
||||
|
||||
# Reinitialize the helper for device
|
||||
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}"
|
||||
|
||||
for BLOB_LIST in "${MY_DIR}/../${DEVICE}/device-proprietary-files.txt"; do
|
||||
for BLOB_LIST in "${MY_DIR}"/common-proprietary-files*.txt; do
|
||||
extract "${BLOB_LIST}" "${SRC}"
|
||||
done
|
||||
|
||||
./../msm8226-common/extract-files.sh $@
|
||||
export BOARD_COMMON=msm8226-common
|
||||
|
||||
"${MY_DIR}/setup-makefiles.sh"
|
||||
"./../../${VENDOR}/${BOARD_COMMON}/extract-files.sh" "$@"
|
||||
|
|
|
|||
|
|
@ -1,62 +1,45 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2016 The CyanogenMod Project
|
||||
# Copyright (C) 2017 The LineageOS Project
|
||||
# Copyright (C) 2017-2021 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 INITIAL_COPYRIGHT_YEAR=2014
|
||||
if [ -z "${DEVICE_COMMON}" ]; then
|
||||
echo ""
|
||||
echo "error: This is a script in a common tree. Please execute" $(basename $0) "from a device tree."
|
||||
echo ""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Load extract_utils and do some sanity checks
|
||||
MY_DIR="${BASH_SOURCE%/*}"
|
||||
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
|
||||
|
||||
LINEAGE_ROOT="${MY_DIR}/../../.."
|
||||
ANDROID_ROOT="${MY_DIR}/../../.."
|
||||
|
||||
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
|
||||
HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
|
||||
if [ ! -f "${HELPER}" ]; then
|
||||
echo "Unable to find helper script at ${HELPER}"
|
||||
exit 1
|
||||
fi
|
||||
. "${HELPER}"
|
||||
source "${HELPER}"
|
||||
|
||||
# Initialize the helper for common device
|
||||
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
|
||||
# Initialize the helper for common
|
||||
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
|
||||
|
||||
# Copyright headers and common guards
|
||||
# Warning headers and guards
|
||||
write_headers "matissewifi matisse3g matisselte"
|
||||
|
||||
write_makefiles "${MY_DIR}/common-proprietary-files.txt"
|
||||
# The standard common blobs
|
||||
write_makefiles "${MY_DIR}/common-proprietary-files.txt" true
|
||||
|
||||
# Finish
|
||||
write_footers
|
||||
|
||||
if [ ! -z "${VARIANT_COPYRIGHT_YEAR}" ]; then
|
||||
export INITIAL_COPYRIGHT_YEAR="${VARIANT_COPYRIGHT_YEAR}"
|
||||
fi
|
||||
export BOARD_COMMON=msm8226-common
|
||||
|
||||
# Reinitialize the helper for device
|
||||
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}"
|
||||
|
||||
# Copyright headers and guards
|
||||
write_headers
|
||||
|
||||
for BLOB_LIST in "${MY_DIR}/../${DEVICE}/device-proprietary-files*.txt"; do
|
||||
write_makefiles ${BLOB_LIST}
|
||||
done
|
||||
|
||||
write_footers
|
||||
|
||||
./../msm8226-common/setup-makefiles.sh $@
|
||||
"./../../${VENDOR}/${BOARD_COMMON}/setup-makefiles.sh" "$@"
|
||||
|
|
|
|||
Loading…
Reference in New Issue