StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: I33cc344a3234de6698676c32035622acbec03dd1
This commit is contained in:
Michael Bestas
2016-10-20 23:25:40 +03:00
committed by Gerrit Code Review
parent 5bf45276b7
commit e724a1c496
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/envsetup.sh
View File

@@ -258,7 +258,7 @@ function aospremote()
return 1 return 1
fi fi
git remote rm aosp 2> /dev/null 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") if (echo $PROJECT | grep -qv "^device")
then then
PFX="platform/" PFX="platform/"
@@ -275,7 +275,7 @@ function cafremote()
return 1 return 1
fi fi
git remote rm caf 2> /dev/null 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") if (echo $PROJECT | grep -qv "^device")
then then
PFX="platform/" PFX="platform/"