commit d3f80175a6499a8141037aa219d9c396e7dba12b
author Nick Kralevich <nnk@google.com> Tue Dec 08 05:00:16 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 05:00:16 2015 +0000
tree 12125e8f9e8dd5df320874f1b83de524fd4cb139
parent e33ad516e5cebba37ec6316092b1fc95beb70133
parent 4a11050480e6b6ab73d0ac100ae9ad78cd46bc13

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

* commit '53580932250c9f3ba4a052c9fe31aa1de7bf411d':
  adb: Make HOME=/data/local/tmp

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 3fc70b0..6c06669 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -289,7 +289,6 @@
         // 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);
@@ -298,6 +297,8 @@
             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 {