From b5e9a771c43ab22146a76887d5a0a1cc23d1854e Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Wed, 21 Dec 2016 08:30:12 +0800
Subject: [PATCH] build: envsetup: Ensure that we can always run roomservice

Conflicts:
	envsetup.sh
Change-Id: I578cce73f20c86b82c0e0ae852cd0de02f0ed8a3
---
 envsetup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/envsetup.sh b/envsetup.sh
index 3558f142a56..1221e3bad2e 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -705,7 +705,10 @@ function lunch()
         popd > /dev/null
         check_product $product
     else
+        T=$(gettop)
+        pushd $T > /dev/null
         build/tools/roomservice.py $product true
+        popd > /dev/null
     fi
     TARGET_PRODUCT=$product \
     TARGET_BUILD_VARIANT=$variant \