commit 4cf635a5ad34875878971d5048b3e61084e699e0
author Gabriele M <moto.falcon.git@gmail.com> Thu Jan 05 22:10:00 2017 +0100
committer Luca Stefani <luca.stefani.ge1@gmail.com> Fri Jan 06 10:23:46 2017 +0000
tree 8c0a92aad9f436d3f9575a75eef16b9ec9f244d3
parent ed8c248ec096fad1c3c3171a38e8ed7d8de867bd

extract_utils: Update backsmali command

-e no longer exists starting from v2.2b3, so update the
command. While at it, add the logic to deal with Android N
separated boot oat files.

Change-Id: Iab8e3946d6421824fea74e26dc43d2db38573022

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 1253700..5461cf4 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -690,8 +690,12 @@
         if get_file "$OAT" "$TMPDIR" "$SRC"; then
             java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$TMPDIR/$(basename "$OAT")"
         elif [[ "$CM_TARGET" =~ .jar$ ]]; then
-            # try to extract classes.dex from boot.oat for framework jars
-            java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" -e "/$OEM_TARGET" "$BOOTOAT"
+            # try to extract classes.dex from boot.oats for framework jars
+            JAROAT="$TMPDIR/system/framework/$ARCH/boot-$(basename ${OEM_TARGET%.*}).oat"
+            if [ ! -f "$JAROAT" ]; then
+                JAROAT=$BOOTOAT;
+            fi
+            java -jar "$BAKSMALIJAR" deodex -o "$TMPDIR/dexout" -b "$BOOTOAT" -d "$TMPDIR" "$JAROAT/$OEM_TARGET"
         else
             continue
         fi