extract_utils: We are OMNI not CM
Change-Id: I4c7335e7648f93d26309938b0feed7002b9a82b6
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 879fccc..655bf5c 100755
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -44,7 +44,7 @@
#
# $1: device name
# $2: vendor name
-# $3: CM root directory
+# $3: OMNI root directory
# $4: is common device - optional, default to false
# $5: cleanup - optional, default to true
# $6: custom vendor makefile name - optional, default to false
@@ -65,15 +65,15 @@
exit 1
fi
- export CM_ROOT="$3"
- if [ ! -d "$CM_ROOT" ]; then
- echo "\$CM_ROOT must be set and valid before including this script!"
+ export OMNI_ROOT="$3"
+ if [ ! -d "$OMNI_ROOT" ]; then
+ echo "\$OMNI_ROOT must be set and valid before including this script!"
exit 1
fi
export OUTDIR=vendor/"$VENDOR"/"$DEVICE"
- if [ ! -d "$CM_ROOT/$OUTDIR" ]; then
- mkdir -p "$CM_ROOT/$OUTDIR"
+ if [ ! -d "$OMNI_ROOT/$OUTDIR" ]; then
+ mkdir -p "$OMNI_ROOT/$OUTDIR"
fi
VNDNAME="$6"
@@ -81,9 +81,9 @@
VNDNAME="$DEVICE"
fi
- export PRODUCTMK="$CM_ROOT"/"$OUTDIR"/device-vendor.mk
- export ANDROIDMK="$CM_ROOT"/"$OUTDIR"/Android.mk
- export BOARDMK="$CM_ROOT"/"$OUTDIR"/BoardConfigVendor.mk
+ export PRODUCTMK="$OMNI_ROOT"/"$OUTDIR"/device-vendor.mk
+ export ANDROIDMK="$OMNI_ROOT"/"$OUTDIR"/Android.mk
+ export BOARDMK="$OMNI_ROOT"/"$OUTDIR"/BoardConfigVendor.mk
if [ "$4" == "true" ] || [ "$4" == "1" ]; then
COMMON=1
@@ -771,7 +771,7 @@
# Convert apk|jar .odex in the corresposing classes.dex
#
function oat2dex() {
- local CM_TARGET="$1"
+ local OMNI_TARGET="$1"
local OEM_TARGET="$2"
local SRC="$3"
local TARGET=
@@ -793,11 +793,11 @@
else
export OATDUMP="$ANDROID_HOST_OUT/bin/oatdump"
fi
- export VDEXEXTRACTOR="$CM_ROOT"/vendor/omni/build/tools/"$HOST"/vdexExtractor
+ export VDEXEXTRACTOR="$OMNI_ROOT"/vendor/omni/build/tools/"$HOST"/vdexExtractor
fi
if [ -z "$CDEXCONVERTER" ]; then
- export CDEXCONVERTER="$CM_ROOT"/vendor/omni/build/tools/"$HOST"/compact_dex_converter
+ export CDEXCONVERTER="$OMNI_ROOT"/vendor/omni/build/tools/"$HOST"/compact_dex_converter
fi
# Extract existing boot.oats to the temp folder
@@ -817,11 +817,11 @@
FULLY_DEODEXED=1 && return 0 # system is fully deodexed, return
fi
- if [ ! -f "$CM_TARGET" ]; then
+ if [ ! -f "$OMNI_TARGET" ]; then
return;
fi
- if grep "classes.dex" "$CM_TARGET" >/dev/null; then
+ if grep "classes.dex" "$OMNI_TARGET" >/dev/null; then
return 0 # target apk|jar is already odexed, return
fi
@@ -846,7 +846,7 @@
"$OATDUMP" --oat-file="$TMPDIR/$(basename "$OAT")" --export-dex-to="$TMPDIR" > /dev/null
mv "$(find "$TMPDIR" -maxdepth 1 -type f -name "*_export.dex" | wc -l | tr -d ' ')" "$TMPDIR/classes.dex"
fi
- elif [[ "$CM_TARGET" =~ .jar$ ]]; then
+ elif [[ "$OMNI_TARGET" =~ .jar$ ]]; then
JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat"
JARVDEX="/system/framework/boot-$(basename ${OEM_TARGET%.*}).vdex"
if [ ! -f "$JAROAT" ]; then
@@ -945,7 +945,7 @@
local HASHLIST=( ${PRODUCT_COPY_FILES_HASHES[@]} ${PRODUCT_PACKAGES_HASHES[@]} )
local COUNT=${#FILELIST[@]}
local SRC="$2"
- local OUTPUT_ROOT="$CM_ROOT"/"$OUTDIR"/proprietary
+ local OUTPUT_ROOT="$OMNI_ROOT"/"$OUTDIR"/proprietary
local OUTPUT_TMP="$TMPDIR"/"$OUTDIR"/proprietary
if [ "$SRC" = "adb" ]; then
@@ -953,7 +953,7 @@
fi
if [ -f "$SRC" ] && [ "${SRC##*.}" == "zip" ]; then
- DUMPDIR="$CM_ROOT"/system_dump
+ DUMPDIR="$OMNI_ROOT"/system_dump
# Check if we're working with the same zip that was passed last time.
# If so, let's just use what's already extracted.
@@ -973,7 +973,7 @@
# If OTA is block based, extract it.
elif [ -a "$DUMPDIR"/system.new.dat ]; then
echo "Converting system.new.dat to system.img"
- python "$CM_ROOT"/vendor/omni/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
+ python "$OMNI_ROOT"/vendor/omni/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system
mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp
echo "Requesting sudo access to mount the system.img"
@@ -1125,7 +1125,7 @@
local FILELIST=( ${PRODUCT_COPY_FILES_LIST[@]} )
local COUNT=${#FILELIST[@]}
local SRC="$2"
- local OUTPUT_DIR="$CM_ROOT"/"$OUTDIR"/radio
+ local OUTPUT_DIR="$OMNI_ROOT"/"$OUTDIR"/radio
if [ "$VENDOR_RADIO_STATE" -eq "0" ]; then
echo "Cleaning firmware output directory ($OUTPUT_DIR).."