| commit | ea8af616089693f2a038369483d1a97a05a1bf34 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jan 13 20:15:27 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 13 20:15:27 2020 +0000 |
| tree | acd339309d3a9f69e1752b1c1c9c2ebc3b87cf27 | |
| parent | 95175385110292a02b188a834d4c5f2725feadc6 [diff] | |
| parent | a04e21a63c7295d68014b91576defbf0304b4b7c [diff] |
Merge "Remove leftover support for target-as-host"
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