Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6246c53 authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

FP3: Adapt {extract-utils.sh,setup-makefiles.sh} for a standalone device

parent 5df87a2e

extract-files.sh

+4 −17
Original line number Original line Diff line number Diff line
@@ -21,8 +21,6 @@ set -e 
export DEVICE=FP3

export DEVICE=FP3

export VENDOR=fairphone

export VENDOR=fairphone





export DEVICE_BRINGUP_YEAR=2020



# 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
@@ -67,7 +65,6 @@ fi 




function blob_fixup() {

function blob_fixup() {

    case "${1}" in

    case "${1}" in



    product/etc/permissions/qcrilhook.xml)

    product/etc/permissions/qcrilhook.xml)

        sed -i "s|/system/framework/qcrilhook.jar|/product/framework/qcrilhook.jar|g" "${2}"

        sed -i "s|/system/framework/qcrilhook.jar|/product/framework/qcrilhook.jar|g" "${2}"

        ;;

        ;;
@@ -88,21 +85,11 @@ function blob_fixup() { 
    esac

    esac

}

}





# Initialize the helper for common device

# Initialize the helper

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"



extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \

        "${KANG}" --section "${SECTION}"



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}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}"





    extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" \

extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"

            "${KANG}" --section "${SECTION}"

fi





COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"

DEVICE_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"





"${MY_DIR}/setup-makefiles.sh"
 
"${MY_DIR}/setup-makefiles.sh"

setup-makefiles.sh

+4 −19
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ set -e 
export DEVICE=FP3

export DEVICE=FP3

export VENDOR=fairphone

export VENDOR=fairphone





export DEVICE_BRINGUP_YEAR=2020

export INITIAL_COPYRIGHT_YEAR=2020





# Load extract_utils and do some sanity checks

# Load extract_utils and do some sanity checks

MY_DIR="${BASH_SOURCE%/*}"

MY_DIR="${BASH_SOURCE%/*}"
@@ -36,29 +36,14 @@ if [ ! -f "${HELPER}" ]; then 
fi

fi

source "${HELPER}"

source "${HELPER}"





# Initialize the helper for common

# Initialize the helper

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" true



# Copyright headers and guards

write_headers "FP3"



# The standard common blobs

write_makefiles "${MY_DIR}/proprietary-files.txt" true



# Finish

write_footers



if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then

    # Reinitialize the helper for device

    INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false

setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false





# Copyright headers and guards

# Copyright headers and guards

    write_headers

write_headers "FP3"





# The standard device blobs

# The standard device blobs

    write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true

write_makefiles "${MY_DIR}/proprietary-files.txt" true





# Finish

# Finish

write_footers
 
write_footers
 
fi