summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-11-06 18:05:16 -0800
committerElliott Hughes <enh@google.com>2015-11-06 18:05:16 -0800
commit79e1c7a7f8a6caf8fe77c6fa1ef46b3ddac9fb99 (patch)
treee9c9851d9637c01be675b29e71fc1671ce1973ba
parentae2a64e2baf015cf51da67133a33238588be5550 (diff)
downloadcore-79e1c7a7f8a6caf8fe77c6fa1ef46b3ddac9fb99.tar.gz
core-79e1c7a7f8a6caf8fe77c6fa1ef46b3ddac9fb99.tar.bz2
core-79e1c7a7f8a6caf8fe77c6fa1ef46b3ddac9fb99.zip
AOSP master doesn't have "cmd".
Change-Id: I0f524b779a623a9e2db923fd9003b102460ae46f
-rw-r--r--adb/transport.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/adb/transport.cpp b/adb/transport.cpp
index ad607e981..9d5085491 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -784,7 +784,9 @@ const FeatureSet& supported_features() {
// Local static allocation to avoid global non-POD variables.
static const FeatureSet* features = new FeatureSet{
kFeatureShell2,
- kFeatureCmd
+ // Internal master has 'cmd'. AOSP master doesn't.
+ // kFeatureCmd
+
// Increment ADB_SERVER_VERSION whenever the feature list changes to
// make sure that the adb client and server features stay in sync
// (http://b/24370690).