commit 31fa3cb3d029d47c7fd6a10fa60cb969997b8cdd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 13 20:34:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 13 20:34:19 2020 +0000
tree acd339309d3a9f69e1752b1c1c9c2ebc3b87cf27
parent bb2d13f94fbd79e6fe1ab08166d20098a2601d63
parent 64609648f2a5f8aa11e402e8a0d09cc02962bfb8

Merge "Remove leftover support for target-as-host" am: 5688181a11 am: dfe4a19f7e

Change-Id: If64300a3e07d504fa9e2ea9c5761a9fcd0d7970d

adb/adb.h

diff --git a/adb/adb.h b/adb/adb.h
index e7fcc91..7f7dd0d 100644
--- a/adb/adb.h
+++ b/adb/adb.h
@@ -185,14 +185,7 @@
     } while (0)
 #endif
 
-#if ADB_HOST_ON_TARGET
-/* adb and adbd are coexisting on the target, so use 5038 for adb
- * to avoid conflicting with adbd's usage of 5037
- */
-#define DEFAULT_ADB_PORT 5038
-#else
 #define DEFAULT_ADB_PORT 5037
-#endif
 
 #define DEFAULT_ADB_LOCAL_TRANSPORT_PORT 5555