commit e724a1c496e16dda16c87e66bb24cbe538a036db
author Michael Bestas <mikeioannina@cyanogenmod.org> Thu Oct 20 23:25:40 2016 +0300
committer Gerrit Code Review <gerrit@cyanogenmod.org> Mon Oct 24 10:40:12 2016 -0700
tree 3a3cca18a8b3749e592ff3f3cc418234eb0b4400
parent 5bf45276b75a9dc30b74a4dd1510d479cabb26eb

envsetup: Fix cafremote/aospremote for projects with non-standard paths

* Fix -caf and -caf-<platform> projects
* Fix AOSP HALs that are synced in "/default" subfolder

Change-Id: I33cc344a3234de6698676c32035622acbec03dd1

build/envsetup.sh

diff --git a/build/envsetup.sh b/build/envsetup.sh
index f534eb8..2d60bc3 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -258,7 +258,7 @@
         return 1
     fi
     git remote rm aosp 2> /dev/null
-    PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##")
+    PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##")
     if (echo $PROJECT | grep -qv "^device")
     then
         PFX="platform/"
@@ -275,7 +275,7 @@
         return 1
     fi
     git remote rm caf 2> /dev/null
-    PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##")
+    PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##")
     if (echo $PROJECT | grep -qv "^device")
     then
         PFX="platform/"