summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--envsetup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 3c11a22..6715419 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1710,7 +1710,7 @@ function aospremote()
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/"
@@ -1727,7 +1727,7 @@ function cafremote()
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/"