commit 5dc4c6e9c183f35aebc8da70fba9741214012b08
author Humberto Borba <humberos@omnirom.org> Sat Feb 03 00:34:23 2018 -0200
committer Humberto Borba <humberos@omnirom.org> Sun Feb 11 02:29:46 2018 -0200
tree b964ef82b5ddcb77f307139465c6ae9c2a40ea82
parent 6a5c96dab4c60e4a45dc7e6545910956a8183d4b

vendor: omni: utils: Fix aosp merging script

Change-Id: Ib3e1ef4b9516422462bb9597ac06f8ade02a3b2a
Signed-off-by: Humberto Borba <humberos@omnirom.org>

utils/aosp-push-merge.sh

diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index c9321c1..b41177b 100755
--- a/utils/aosp-push-merge.sh
+++ b/utils/aosp-push-merge.sh
@@ -26,9 +26,9 @@
 while read path;
     do
 
-    project=`echo android_${path} | sed -e 's/\//\_/g'`
-    if [ "${project}" == "android_build_make" ] ; then
-        project="android_build"
+    project=`echo android_${path} | sed -e 's/\//\_/g'`;
+    if [ "${path}" == "build" ] ; then
+        path="build/make";
     fi
 
     echo ""