ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Enable the APEX support on the device side." am: 239245fe79

Browse source 
am: 7cc9405fbc

Change-Id: I3145633d1de3484c4f27eb3f4dd4ea4a341eaa7e
This commit is contained in:
Josh Gao 2018-12-04 05:06:23 -08:00 • committed by android-build-merger
commit 3af2f75196
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/transport.cpp
View file

@ -1009,14 +1009,11 @@ size_t atransport::get_max_payload() const {
const FeatureSet& supported_features() {
// Local static allocation to avoid global non-POD variables.
static const FeatureSet* features = new FeatureSet{
kFeatureShell2, kFeatureCmd, kFeatureStat2, kFeatureFixedPushMkdir,
#if ADB_HOST
kFeatureApex
#endif
// Increment ADB_SERVER_VERSION when adding a feature that adbd needs
// to know about. Otherwise, the client can be stuck running an old
// version of the server even after upgrading their copy of adb.
// (http://b/24370690)
kFeatureShell2, kFeatureCmd, kFeatureStat2, kFeatureFixedPushMkdir, kFeatureApex
// Increment ADB_SERVER_VERSION when adding a feature that adbd needs
// to know about. Otherwise, the client can be stuck running an old
// version of the server even after upgrading their copy of adb.
// (http://b/24370690)
};
return *features;