commit daf6534cd319d94e2f8e66db4a12f98004af0da4
author Josh Gao <jmgao@google.com> Wed Oct 16 16:49:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 16 16:49:34 2019 -0700
tree a2c8e7b20970c9751a811d4374ea73a2b891b808
parent 9a17b490d4b972cb8dd6334c3152ed38ac89bca0
parent fdf5074e53a0b53776965edca644a168dde88f94

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

Change-Id: I5ba08f00180ba81033a7d1388e7e2247c7246237

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