openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 2121219c: am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev 

* commit '2121219cfd5cc288d6ad1f42d5d37d62e476c7b0':
  Bring back ADB_EXTERNAL_STORAGE.
This commit is contained in:
Jeff Sharkey 2012-09-06 13:12:45 -07:00 committed by Android Git Automerger
parent fa15d3acb0 2121219cfd
commit f0118c72c6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/adb.c
View File

@ -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()) {