Merge "Remove leftover support for target-as-host"

am: 5688181a11

Change-Id: Ib87b5eaffd36e9e7ff6faafd5682ff34df5a4107
This commit is contained in:
Kevin Brodsky 2020-01-13 12:18:54 -08:00 committed by android-build-merger
commit dfe4a19f7e

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