diff options
| author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-10-20 23:25:40 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-10-20 23:38:02 +0300 |
| commit | 6fd080e10615f641ad3b60f38d5753aec4a6b5be (patch) | |
| tree | 526070c01e17419c3e5a0704502b34c557a1f1ac /envsetup.sh | |
| parent | 5bf9b09f6420bd494702ce1b7eb8d502e2d33963 (diff) | |
| download | build-6fd080e10615f641ad3b60f38d5753aec4a6b5be.zip build-6fd080e10615f641ad3b60f38d5753aec4a6b5be.tar.gz build-6fd080e10615f641ad3b60f38d5753aec4a6b5be.tar.bz2 | |
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
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 4 |
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/" |