LineageOS/android_tools_extract-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove branding from script variables

Browse Source 
No need to force branding down everyone's throat,
most of the other android forks using these scripts are
rebranding the variables anyway.
Let's reduce fragmentation.

Change-Id: Ie9c223d1a42728076f45b40a11cd0820010db8b1
This commit is contained in:
Michael Bestas
2020-12-19 03:29:25 +02:00
committed by Bruno Martins
parent 5a82907bb9
commit ab77884b8e
3 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
extract_utils.sh
View File

@@ -48,7 +48,7 @@ trap cleanup 0
# #
# $1: device name # $1: device name
# $2: vendor name # $2: vendor name
# $3: Lineage root directory # $3: Android root directory
# $4: is common device - optional, default to false # $4: is common device - optional, default to false
# $5: cleanup - optional, default to true # $5: cleanup - optional, default to true
# $6: custom vendor makefile name - optional, default to false # $6: custom vendor makefile name - optional, default to false
@@ -69,15 +69,15 @@ function setup_vendor() {
exit 1 exit 1
fi fi
export LINEAGE_ROOT="$3" export ANDROID_ROOT="$3"
if [ ! -d "$LINEAGE_ROOT" ]; then if [ ! -d "$ANDROID_ROOT" ]; then
echo "\$LINEAGE_ROOT must be set and valid before including this script!" echo "\$ANDROID_ROOT must be set and valid before including this script!"
exit 1 exit 1
fi fi
export OUTDIR=vendor/"$VENDOR"/"$DEVICE" export OUTDIR=vendor/"$VENDOR"/"$DEVICE"
if [ ! -d "$LINEAGE_ROOT/$OUTDIR" ]; then if [ ! -d "$ANDROID_ROOT/$OUTDIR" ]; then
mkdir -p "$LINEAGE_ROOT/$OUTDIR" mkdir -p "$ANDROID_ROOT/$OUTDIR"
fi fi
VNDNAME="$6" VNDNAME="$6"
@@ -85,10 +85,10 @@ function setup_vendor() {
VNDNAME="$DEVICE" VNDNAME="$DEVICE"
fi fi
export PRODUCTMK="$LINEAGE_ROOT"/"$OUTDIR"/"$VNDNAME"-vendor.mk export PRODUCTMK="$ANDROID_ROOT"/"$OUTDIR"/"$VNDNAME"-vendor.mk
export ANDROIDBP="$LINEAGE_ROOT"/"$OUTDIR"/Android.bp export ANDROIDBP="$ANDROID_ROOT"/"$OUTDIR"/Android.bp
export ANDROIDMK="$LINEAGE_ROOT"/"$OUTDIR"/Android.mk export ANDROIDMK="$ANDROID_ROOT"/"$OUTDIR"/Android.mk
export BOARDMK="$LINEAGE_ROOT"/"$OUTDIR"/BoardConfigVendor.mk export BOARDMK="$ANDROID_ROOT"/"$OUTDIR"/BoardConfigVendor.mk
if [ "$4" == "true" ] || [ "$4" == "1" ]; then if [ "$4" == "true" ] || [ "$4" == "1" ]; then
COMMON=1 COMMON=1
@@ -105,7 +105,7 @@ function setup_vendor() {
fi fi
if [ -z "$PATCHELF" ]; then if [ -z "$PATCHELF" ]; then
export PATCHELF="$LINEAGE_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/patchelf export PATCHELF="$ANDROID_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/patchelf
fi fi
} }
@@ -1249,23 +1249,23 @@ function get_file() {
# Convert apk|jar .odex in the corresposing classes.dex # Convert apk|jar .odex in the corresposing classes.dex
# #
function oat2dex() { function oat2dex() {
local LINEAGE_TARGET="$1" local CUSTOM_TARGET="$1"
local OEM_TARGET="$2" local OEM_TARGET="$2"
local SRC="$3" local SRC="$3"
local TARGET= local TARGET=
local OAT= local OAT=
if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then
export BAKSMALIJAR="$LINEAGE_ROOT"/prebuilts/extract-tools/common/smali/baksmali.jar export BAKSMALIJAR="$ANDROID_ROOT"/prebuilts/extract-tools/common/smali/baksmali.jar
export SMALIJAR="$LINEAGE_ROOT"/prebuilts/extract-tools/common/smali/smali.jar export SMALIJAR="$ANDROID_ROOT"/prebuilts/extract-tools/common/smali/smali.jar
fi fi
if [ -z "$VDEXEXTRACTOR" ]; then if [ -z "$VDEXEXTRACTOR" ]; then
export VDEXEXTRACTOR="$LINEAGE_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/vdexExtractor export VDEXEXTRACTOR="$ANDROID_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/vdexExtractor
fi fi
if [ -z "$CDEXCONVERTER" ]; then if [ -z "$CDEXCONVERTER" ]; then
export CDEXCONVERTER="$LINEAGE_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/compact_dex_converter export CDEXCONVERTER="$ANDROID_ROOT"/prebuilts/extract-tools/${HOST}-x86/bin/compact_dex_converter
fi fi
# Extract existing boot.oats to the temp folder # Extract existing boot.oats to the temp folder
@@ -1285,11 +1285,11 @@ function oat2dex() {
FULLY_DEODEXED=1 && return 0 # system is fully deodexed, return FULLY_DEODEXED=1 && return 0 # system is fully deodexed, return
fi fi
if [ ! -f "$LINEAGE_TARGET" ]; then if [ ! -f "$CUSTOM_TARGET" ]; then
return; return;
fi fi
if grep "classes.dex" "$LINEAGE_TARGET" >/dev/null; then if grep "classes.dex" "$CUSTOM_TARGET" >/dev/null; then
return 0 # target apk|jar is already odexed, return return 0 # target apk|jar is already odexed, return
fi fi
@@ -1317,7 +1317,7 @@ function oat2dex() {
java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$TMPDIR/$(basename "$OAT")" java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$TMPDIR/$(basename "$OAT")"
java -jar "$SMALIJAR" assemble "$TMPDIR/dexout" -o "$TMPDIR/classes.dex" java -jar "$SMALIJAR" assemble "$TMPDIR/dexout" -o "$TMPDIR/classes.dex"
fi fi
elif [[ "$LINEAGE_TARGET" =~ .jar$ ]]; then elif [[ "$CUSTOM_TARGET" =~ .jar$ ]]; then
JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat" JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat"
JARVDEX="/system/framework/boot-$(basename ${OEM_TARGET%.*}).vdex" JARVDEX="/system/framework/boot-$(basename ${OEM_TARGET%.*}).vdex"
if [ ! -f "$JAROAT" ]; then if [ ! -f "$JAROAT" ]; then
@@ -1512,7 +1512,7 @@ function extract() {
local FIXUP_HASHLIST=( ${PRODUCT_COPY_FILES_FIXUP_HASHES[@]} ${PRODUCT_PACKAGES_FIXUP_HASHES[@]} ) local FIXUP_HASHLIST=( ${PRODUCT_COPY_FILES_FIXUP_HASHES[@]} ${PRODUCT_PACKAGES_FIXUP_HASHES[@]} )
local PRODUCT_COPY_FILES_COUNT=${#PRODUCT_COPY_FILES_LIST[@]} local PRODUCT_COPY_FILES_COUNT=${#PRODUCT_COPY_FILES_LIST[@]}
local COUNT=${#FILELIST[@]} local COUNT=${#FILELIST[@]}
local OUTPUT_ROOT="$LINEAGE_ROOT"/"$OUTDIR"/proprietary local OUTPUT_ROOT="$ANDROID_ROOT"/"$OUTDIR"/proprietary
local OUTPUT_TMP="$TMPDIR"/"$OUTDIR"/proprietary local OUTPUT_TMP="$TMPDIR"/"$OUTDIR"/proprietary
if [ "$SRC" = "adb" ]; then if [ "$SRC" = "adb" ]; then
@@ -1549,7 +1549,7 @@ function extract() {
fi fi
if [ -a "$DUMPDIR"/"$PARTITION".new.dat ]; then if [ -a "$DUMPDIR"/"$PARTITION".new.dat ]; then
echo "Converting "$PARTITION".new.dat to "$PARTITION".img" echo "Converting "$PARTITION".new.dat to "$PARTITION".img"
python "$LINEAGE_ROOT"/tools/extract-utils/sdat2img.py "$DUMPDIR"/"$PARTITION".transfer.list "$DUMPDIR"/"$PARTITION".new.dat "$DUMPDIR"/"$PARTITION".img 2>&1 python "$ANDROID_ROOT"/tools/extract-utils/sdat2img.py "$DUMPDIR"/"$PARTITION".transfer.list "$DUMPDIR"/"$PARTITION".new.dat "$DUMPDIR"/"$PARTITION".img 2>&1
rm -rf "$DUMPDIR"/"$PARTITION".new.dat "$DUMPDIR"/"$PARTITION" rm -rf "$DUMPDIR"/"$PARTITION".new.dat "$DUMPDIR"/"$PARTITION"
mkdir "$DUMPDIR"/"$PARTITION" "$DUMPDIR"/tmp mkdir "$DUMPDIR"/"$PARTITION" "$DUMPDIR"/tmp
echo "Requesting sudo access to mount the "$PARTITION".img" echo "Requesting sudo access to mount the "$PARTITION".img"
@@ -1639,7 +1639,7 @@ function extract() {
printf ' + keeping pinned file with hash %s\n' "${HASH}" printf ' + keeping pinned file with hash %s\n' "${HASH}"
else else
FOUND=false FOUND=false
# Try Lineage target first. # Try custom target first.
# Also try to search for files stripped of # Also try to search for files stripped of
# the "/system" prefix, if we're actually extracting # the "/system" prefix, if we're actually extracting
# from a system image. # from a system image.
@@ -1727,7 +1727,7 @@ function extract_firmware() {
local FILELIST=( ${PRODUCT_COPY_FILES_LIST[@]} ) local FILELIST=( ${PRODUCT_COPY_FILES_LIST[@]} )
local COUNT=${#FILELIST[@]} local COUNT=${#FILELIST[@]}
local SRC="$2" local SRC="$2"
local OUTPUT_DIR="$LINEAGE_ROOT"/"$OUTDIR"/radio local OUTPUT_DIR="$ANDROID_ROOT"/"$OUTDIR"/radio
if [ "$VENDOR_RADIO_STATE" -eq "0" ]; then if [ "$VENDOR_RADIO_STATE" -eq "0" ]; then
echo "Cleaning firmware output directory ($OUTPUT_DIR).." echo "Cleaning firmware output directory ($OUTPUT_DIR).."

6
templates/single-device/extract-files.sh
View File

@@ -25,9 +25,9 @@ VENDOR=*** FILL IN VENDOR ****
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
LINEAGE_ROOT="${MY_DIR}/../../.." ANDROID_ROOT="${MY_DIR}/../../.."
HELPER="${LINEAGE_ROOT}/tools/extract-utils/extract_utils.sh" HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
if [ ! -f "${HELPER}" ]; then if [ ! -f "${HELPER}" ]; then
echo "Unable to find helper script at ${HELPER}" echo "Unable to find helper script at ${HELPER}"
exit 1 exit 1
@@ -60,7 +60,7 @@ if [ -z "${SRC}" ]; then
fi fi
# Initialize the helper # Initialize the helper
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}" false "${CLEAN_VENDOR}" setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" ${KANG} --section "${SECTION}" extract "${MY_DIR}/proprietary-files.txt" "${SRC}" ${KANG} --section "${SECTION}"

6
templates/single-device/setup-makefiles.sh
View File

@@ -27,9 +27,9 @@ INITIAL_COPYRIGHT_YEAR=**** FILL IN COPYRIGHT YEAR ****
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
LINEAGE_ROOT="$MY_DIR"/../../.. ANDROID_ROOT="$MY_DIR"/../../..
HELPER="$LINEAGE_ROOT"/tools/extract-utils/extract_utils.sh HELPER="$ANDROID_ROOT"/tools/extract-utils/extract_utils.sh
if [ ! -f "$HELPER" ]; then if [ ! -f "$HELPER" ]; then
echo "Unable to find helper script at $HELPER" echo "Unable to find helper script at $HELPER"
exit 1 exit 1
@@ -37,7 +37,7 @@ fi
. "$HELPER" . "$HELPER"
# Initialize the helper # Initialize the helper
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT"
# Copyright headers and guards # Copyright headers and guards
write_headers write_headers