commit 4e75f576f9589fcbd1d26b6406aa6dab13378d76
author Paul Keith <javelinanddart@gmail.com> Mon Jan 29 22:06:22 2018 +0100
committer Michael Bestas <mkbestas@lineageos.org> Mon Jan 29 23:33:57 2018 +0200
tree 674c243f4b6b50ca591e081ae5d1e17b46c2a186
parent 3957e06d5a62aff5f6a7fd8983e2efb33b80b6ab

extract_utils: Fix regressions from 3f9b94cb67a88999f7747af8335c5e576939360b

Change-Id: I78fc47c63e6bfbd5ee98a56a1d80f763e96ac266

build/tools/extract_utils.sh

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index aed5066..a675f89 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -218,7 +218,7 @@
             LINEEND=""
         fi
 
-        TARGET=$(target_file "$FILE")
+        TARGET=$(echo $(target_file "$FILE") | sed 's/\;.*//')
         if [ "$TREBLE_COMPAT" == "true" ] || [ "$TREBLE_COMPAT" == "1" ]; then
             if prefix_match_file "vendor/" $TARGET ; then
                 local OUTTARGET=$(truncate_file $TARGET)
@@ -934,7 +934,7 @@
 
     for (( i=1; i<COUNT+1; i++ )); do
 
-        local FROM=$(target_file "${FILELIST[$i-1]}")
+        local FROM=$(echo $(target_file "${FILELIST[$i-1]}") | sed 's/\;.*//')
         local ARGS=$(target_args "${FILELIST[$i-1]}")
         local SPLIT=(${FILELIST[$i-1]//:/ })
         local FILE=$(echo "${SPLIT[0]#-}" | sed 's/\;.*//')