summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--adb/daemon/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index e5a49171b..9ebab740e 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -248,6 +248,12 @@ int adbd_main(int server_port) {
prop_port = android::base::GetProperty("persist.adb.tcp.port", "");
}
+#if !defined(__ANDROID__)
+ if (prop_port.empty() && getenv("ADBD_PORT")) {
+ prop_port = getenv("ADBD_PORT");
+ }
+#endif
+
int port;
if (sscanf(prop_port.c_str(), "%d", &port) == 1 && port > 0) {
D("using port=%d", port);