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

Commit 095fbbce authored by Olivier Karasangabo's avatar Olivier Karasangabo Committed by Ole Birketvedt
Browse files

suzuran: Use blob extraction scripts in kitakami-common

Change-Id: I585f4378e1003adca815b064c9da0a76521a2201
parent f2daf2f4
Loading
Loading
Loading
Loading
+3 −34
Original line number Diff line number Diff line
@@ -19,40 +19,9 @@ set -e

FP=$(cd ${0%/*} && pwd -P)
export DEVICE=$(basename $FP)
export DEVICE_COMMON=kitakami-common
export VENDOR=$(basename $(dirname $FP))

# Load extractutils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
export DEVICE_BRINGUP_YEAR=2016

CM_ROOT="$MY_DIR"/../../..

HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
    echo "Unable to find helper script at $HELPER"
    exit 1
fi
. "$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

# Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"

extract "$MY_DIR"/proprietary-files.txt "$SRC"

"$MY_DIR"/setup-makefiles.sh
./../../$VENDOR/$DEVICE_COMMON/extract-files.sh $@
+3 −32
Original line number Diff line number Diff line
@@ -19,38 +19,9 @@ set -e

FP=$(cd ${0%/*} && pwd -P)
export DEVICE=$(basename $FP)
export DEVICE_COMMON=kitakami-common
export VENDOR=$(basename $(dirname $FP))

export INITIAL_COPYRIGHT_YEAR=2016

# Load extractutils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi

CM_ROOT="$MY_DIR"/../../..

HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
if [ ! -f "$HELPER" ]; then
    echo "Unable to find helper script at $HELPER"
    exit 1
fi
. "$HELPER"

# Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"

# Copyright headers and guards
write_headers

# The standard blobs
write_makefiles "$MY_DIR"/proprietary-files.txt

cat << EOF >> "$ANDROIDMK"

\$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null)
\$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib64/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib64 > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null)
EOF

# We are done!
write_footers
export DEVICE_BRINGUP_YEAR=2016

./../../$VENDOR/$DEVICE_COMMON/setup-makefiles.sh $@