Evolution-X-Devices/device_xiaomi_violet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

violet: Switch to standalone extract utils

Browse Source 
Align with templates while we are at it

Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4
This commit is contained in:
Michael Bestas
2020-12-19 02:53:35 +02:00
committed by Shubham Das
parent 5506a56a79
commit 0017b086f5
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extract-files.sh
View File

@@ -1,6 +1,7 @@
#!/bin/bash
#
# Copyright (C) 2018-2020 The LineageOS Project
# Copyright (C) 2016 The CyanogenMod Project
# Copyright (C) 2017-2020 The LineageOS Project
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -16,9 +17,9 @@ DEVICE_BRINGUP_YEAR=2020
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
AOSP_ROOT="${MY_DIR}"/../../..
ANDROID_ROOT="${MY_DIR}/../../.."
HELPER="${AOSP_ROOT}/vendor/aosp/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
@@ -70,11 +71,10 @@ function blob_fixup() {
}
# Initialize the helper for common device
setup_vendor "${DEVICE}" "${VENDOR}" "${AOSP_ROOT}" true "${CLEAN_VENDOR}"
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
"${KANG}" --section "${SECTION}"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
BLOB_ROOT="${AOSP_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"
BLOB_ROOT="${ANDROID_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"
"${MY_DIR}/setup-makefiles.sh"

6
setup-makefiles.sh
View File

@@ -16,9 +16,9 @@ INITIAL_COPYRIGHT_YEAR=2019
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
AOSP_ROOT="${MY_DIR}/../../.."
ANDROID_ROOT="${MY_DIR}/../../.."
HELPER="${AOSP_ROOT}/vendor/aosp/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
@@ -26,7 +26,7 @@ fi
source "${HELPER}"
# Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$AOSP_ROOT"
setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT"
# Copyright headers and guards
write_headers