commit 3429f95445e9f9b277668431d0af76d3edd84950
author Humberto Borba <humberos@gmail.com> Fri Sep 08 10:49:37 2017 -0300
committer Humberto Borba <humberos@gmail.com> Fri Sep 08 11:08:53 2017 -0300
tree c101771176552cf06acd8f8dbb807028c8888bc1
parent 040a946d0f2778c8654900c429fd2ec12aa8dd6c

vendor: omni: utils: Update revision

Change-Id: I09a294f84cf98fd5fc949c4e4a11bd6801e7c31d
Signed-off-by: Humberto Borba <humberos@gmail.com>

utils/aosp-merge.sh

diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index 87d120f..7599b82 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -26,6 +26,9 @@
     do
 
     project=`echo android_${path} | sed -e 's/\//\_/g'`
+    if [ "${project}" == "android_build_make" ] ; then
+        project="android_build"
+    fi
 
     echo ""
     echo "====================================================================="