commit 1d0b1c1bd0bd8bc16d733659964318308348ef93
author micky387 <mickaelsaibi@free.fr> Wed Mar 13 18:25:46 2024 -0400
committer micky387 <mickaelsaibi@free.fr> Wed Mar 13 18:54:55 2024 -0400
tree bd3ac56e42457566fa166600c1a2a3a15e10c9b2
parent 2a95304fc7871588c89e7fc25f22cb29f3dade87

omni: Fix the aosp path in pixel-merge script for device repo

But keep platform for hardware/google/pixel-sepolicy

Change-Id: Ic94c2bfd164f95bc92803d5b43e972fa2960e35e

utils/pixel-merge.sh

diff --git a/utils/pixel-merge.sh b/utils/pixel-merge.sh
index da1fd5e..1a8a713 100755
--- a/utils/pixel-merge.sh
+++ b/utils/pixel-merge.sh
@@ -60,8 +60,13 @@
     # make sure that environment is clean
     ret=$(git merge --abort 2>&1);
 
-    echo " -> Merging remote: https://android.googlesource.com/platform/$aosp_project ${ref}";
-    ret=$(git pull https://android.googlesource.com/platform/$aosp_project ${ref} 2>&1);
+    if [ "${path}" == "hardware/google/pixel-sepolicy" ] ; then
+        echo " -> Merging remote: https://android.googlesource.com/platform/$aosp_project ${ref}";
+        ret=$(git pull https://android.googlesource.com/platform/$aosp_project ${ref} 2>&1);
+    else
+        echo " -> Merging remote: https://android.googlesource.com/$aosp_project ${ref}";
+        ret=$(git pull https://android.googlesource.com/$aosp_project ${ref} 2>&1);
+    fi
 
     if echo $ret | grep "CONFLICT (content)" > /dev/null ; then
         echo -e " -> \e[33mWARNING!: \e[31mMERGE CONFLICT\e[0m";