commit 8b87b09ef7fc2deefc8b6b623c55da1c3dfa0342
author Rashed Abdel-Tawab <rashed@linux.com> Tue Apr 04 18:03:35 2017 -0400
committer Rashed Abdel-Tawab <rashed@linux.com> Sun Jul 30 12:48:18 2017 -0400
tree 155aad922662d95a33e6b73f0a420eaa6d4def00
parent 855fbdd4bc54e7e67ae8d733de55167f8de488c7

extract_files: Add support for paths without system/

Sometime blob directories are contained in dirs not named system
(ex. extracting blobs from another vendor dir) so check if the file
exists without system/ before appending "system/" to filenames.

Change-Id: I4ba946e178260b4f4804b1ac4422645e3085c665

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 76fa63b..0e6ffc3 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -873,6 +873,8 @@
             TARGET="$FROM"
             OUTPUT_DIR="$OUTPUT_DIR/rootfs"
             TMP_DIR="$TMP_DIR/rootfs"
+        elif [ -f "$SRC/$FILE" ] && [ "$SRC" != "adb" ]; then
+            TARGET="$FROM"
         else
             TARGET="system/$FROM"
             FILE="system/$FILE"