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

Change-Id: If64300a3e07d504fa9e2ea9c5761a9fcd0d7970d
This commit is contained in:
Automerger Merge Worker 2020-01-13 20:34:19 +00:00
commit 54d6cdeba5

View file

@ -185,14 +185,7 @@ void put_apacket(apacket* p);
} 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