diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-06 13:08:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-06 13:08:37 -0700 |
| commit | d8a8979bd932a73378286ecea6a03c7fa8e1b2a6 (patch) | |
| tree | ac3ee590b5fe7aa94215f247a863c05cfbdcc6c3 /adb | |
| parent | 83e3842f4efc2647752d85af81869034dda985f6 (diff) | |
| parent | d6d4286a28b4a9aef902585625ea6656ab06cf52 (diff) | |
| download | system_core-d8a8979bd932a73378286ecea6a03c7fa8e1b2a6.zip system_core-d8a8979bd932a73378286ecea6a03c7fa8e1b2a6.tar.gz system_core-d8a8979bd932a73378286ecea6a03c7fa8e1b2a6.tar.bz2 | |
Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/adb.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1122,6 +1122,16 @@ int adb_main(int is_daemon, int server_port) if (auth_enabled) adb_auth_init(); + // Our external storage path may be different than apps, since + // we aren't able to bind mount after dropping root. + const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE"); + if (NULL != adb_external_storage) { + setenv("EXTERNAL_STORAGE", adb_external_storage, 1); + } else { + D("Warning: ADB_EXTERNAL_STORAGE is not set. Leaving EXTERNAL_STORAGE" + " unchanged.\n"); + } + /* don't listen on a port (default 5037) if running in secure mode */ /* don't run as root if we are running in secure mode */ if (should_drop_privileges()) { |