commit 1066c305fe83a9363709ac12fa21ad04c735a0d4
author Josh Gao <jmgao@google.com> Wed Oct 16 17:07:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 17:07:06 2019 -0700
tree a2c8e7b20970c9751a811d4374ea73a2b891b808
parent d91c3d83596e0165a8b402251fb1b1b51207356d
parent daf6534cd319d94e2f8e66db4a12f98004af0da4

Merge "adbd: allow port configuration on host." am: 2fd9d735ea am: 44668cdad2
am: f3c8a9d6f6

Change-Id: I3ad2dc34be1bc267ee8460e261c76bf7016651e3

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);