Merge "adb: bump server version to prevent feature mismatch."
diff --git a/adb.h b/adb.h
index 037c010..a20b345 100644
--- a/adb.h
+++ b/adb.h
@@ -50,7 +50,7 @@
std::string adb_version();
// Increment this when we want to force users to start a new adb server.
-#define ADB_SERVER_VERSION 32
+#define ADB_SERVER_VERSION 33
class atransport;
struct usb_handle;
diff --git a/transport.cpp b/transport.cpp
index 6ebb9c7..2a2fac7 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -786,6 +786,9 @@
// Local static allocation to avoid global non-POD variables.
static const FeatureSet* features = new FeatureSet{
kFeatureShell2
+ // 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).
};
return *features;