commit 2b83eed28d0b3c153e2da0a46496a41a36b617f6
author Josh Gao <jmgao@google.com> Tue Sep 17 17:34:41 2019 +0800
committer Josh Gao <jmgao@google.com> Thu Sep 26 03:23:05 2019 +0800
tree df28ff95db2e3bbf9299bbdfd5e0225b29d4a61e
parent 536f063538e5109dd9b1a6b921b346979f1af22c

adbd: allow port configuration on host.

Test: manual
Change-Id: I68cbd9bdb253a68463cc65e63a764ad4fa410c1c

adb/daemon/main.cpp

diff --git a/adb/daemon/main.cpp b/adb/daemon/main.cpp
index e5a4917..9ebab74 100644
--- a/adb/daemon/main.cpp
+++ b/adb/daemon/main.cpp
@@ -248,6 +248,12 @@
         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);