commit 4185be933ba0da17381d80e044a3610f25a08128
author Nick Kralevich <nnk@google.com> Thu Dec 10 12:57:48 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 12:57:48 2015 -0800
tree d053f11ed3992945658f3ce797f1f4de2bf2962c
parent 3a81400c8591561dc665b61f2f687f718667a19e
parent c54ce6d2dd0bf019ffb9b0206300b8413df88fca

Merge "Revert "adb: Make HOME=/data/local/tmp""
am: ce4bbcfb08

* commit 'ce4bbcfb08bea39dce8c4f71da7326814edfb247':
  Revert "adb: Make HOME=/data/local/tmp"

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 6c06669..3fc70b0 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -289,6 +289,7 @@
         // TODO: $HOSTNAME? Normally bash automatically sets that, but mksh doesn't.
         passwd* pw = getpwuid(getuid());
         if (pw != nullptr) {
+            setenv("HOME", pw->pw_dir, 1);
             setenv("LOGNAME", pw->pw_name, 1);
             setenv("SHELL", pw->pw_shell, 1);
             setenv("USER", pw->pw_name, 1);
@@ -297,8 +298,6 @@
             setenv("TERM", terminal_type_.c_str(), 1);
         }
 
-        setenv("HOME", "/data/local/tmp", 1);
-        chdir(getenv("HOME"));
         if (is_interactive()) {
             execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr);
         } else {