commit 98599b6687758b08c71247ea93d640b72beb8371
author Bruno Martins <bgcngm@gmail.com> Wed Oct 02 15:56:25 2019 -0600
committer pimpmaneaton <shaunsibu@gmail.com> Wed Oct 02 16:06:40 2019 -0600
tree d95463db86e4f8fad1cae84a19aed22982fad9b6
parent 5b937b2bf8d74c78a202e18687a97a16683e6f81

extract_utils: Source the prebuilts from the new repo

The prebuilt tools now live in prebuilts/tools-lineage.

Change-Id: Icd6a6f0a705fc7c16399707bb2a09049d63d15d4

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 213bd63..6aae63d 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -902,16 +902,16 @@
     local HOST="$(uname)"
 
     if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then
-        export BAKSMALIJAR="$BLISS_ROOT"/vendor/bliss/build/tools/smali/baksmali.jar
-        export SMALIJAR="$BLISS_ROOT"/vendor/bliss/build/tools/smali/smali.jar
+        export BAKSMALIJAR="$BLISS_ROOT"/prebuilts/tools-bliss/common/smali/baksmali.jar
+        export SMALIJAR="$BLISS_ROOT"/prebuilts/tools-bliss/common/smali/smali.jar
     fi
 
     if [ -z "$VDEXEXTRACTOR" ]; then
-        export VDEXEXTRACTOR="$BLISS_ROOT"/vendor/bliss/build/tools/"$HOST"/vdexExtractor
+        export VDEXEXTRACTOR="$BLISS_ROOT"/prebuilts/tools-bliss/"${HOST,,}"-x86/bin/vdexExtractor
     fi
 
     if [ -z "$CDEXCONVERTER" ]; then
-        export CDEXCONVERTER="$BLISS_ROOT"/vendor/bliss/build/tools/"$HOST"/compact_dex_converter
+        export CDEXCONVERTER="$BLISS_ROOT"/prebuilts/tools-bliss/"${HOST,,}"-x86/bin/compact_dex_converter
     fi
 
     # Extract existing boot.oats to the temp folder