From fb08510784700b2c6b86fc2c495b925024b51b30 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 22 Oct 2018 13:00:05 -0700 Subject: Add feature flag for b/110953234 fix. Bug: http://b/110953234 Bug: http://b/117946501 Test: adb features Test: test_device.py Change-Id: I340a30544a6d0ab1b2545e5371c8f98d04158c56 --- adb/client/file_sync_client.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'adb/client/file_sync_client.cpp') diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp index 697d9ea14..f0f9a8068 100644 --- a/adb/client/file_sync_client.cpp +++ b/adb/client/file_sync_client.cpp @@ -894,7 +894,8 @@ static bool copy_local_dir_remote(SyncConnection& sc, std::string lpath, // // TODO(b/25457350): We don't preserve permissions on directories. // TODO: Find all of the leaves and `mkdir -p` them instead? - if (CanUseFeature(sc.Features(), kFeatureShell2)) { + if (!CanUseFeature(sc.Features(), kFeatureFixedPushMkdir) && + CanUseFeature(sc.Features(), kFeatureShell2)) { SilentStandardStreamsCallbackInterface cb; std::string cmd = "mkdir"; for (const auto& dir : directory_list) { -- cgit v1.2.3