diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-12-19 02:53:35 +0200 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2021-10-19 15:09:38 +0200 |
| commit | 835a3ac1d2522eb946ec6cfa3e1c9e58b63bb7d0 (patch) | |
| tree | 3fe99909d717f9b31f5805fbb038a0aa57b3df25 | |
| parent | 87129b81d822e6a3d5c5ae58ccfa4e8626c89a55 (diff) | |
msm8996-common: Switch to standalone extract utils
Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4
| -rwxr-xr-x | extract-files.sh | 8 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/extract-files.sh b/extract-files.sh index 123241a..43217d5 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -22,9 +22,9 @@ set -e 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 @@ -106,7 +106,7 @@ function blob_fixup() { } # Initialize the helper for common device -setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}" +setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}" extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \ "${KANG}" --section "${SECTION}" @@ -114,7 +114,7 @@ extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \ if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then # Reinitialize the helper for device source "${MY_DIR}/../${DEVICE}/extract-files.sh" - setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}" + setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}" extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \ "${KANG}" --section "${SECTION}" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 701d3ad..d2f5cbd 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -24,9 +24,9 @@ INITIAL_COPYRIGHT_YEAR=2017 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 @@ -34,7 +34,7 @@ fi source "${HELPER}" # Initialize the helper for common -setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true +setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true # Copyright headers and guards write_headers "z2_plus z2_row" @@ -47,7 +47,7 @@ write_footers if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then # Reinitialize the helper for device - setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false + setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false # Copyright headers and guards write_headers |