commit 806da246b6628b4a153cf1e6ed6f4971d5abb2b6
author Henry Daitx <daitx@google.com> Wed Jan 23 13:29:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 23 13:29:09 2019 -0800
tree b9374467816e433453b4fe3205d43e4d3be0a882
parent 9aca3dbfa8a66381436122cf89e78dc288987195
parent 791f402d4bbb1a76d20713d694b42f511668b894

Merge "Fix fastdeploy failure in Windows" am: 09158b1d5a
am: 9ac57ceae7

Change-Id: Ib86885e9bef10bc7319960d0497de9802df4da77

adb/client/adb_install.cpp

diff --git a/adb/client/adb_install.cpp b/adb/client/adb_install.cpp
index 21e0874..d56a25f 100644
--- a/adb/client/adb_install.cpp
+++ b/adb/client/adb_install.cpp
@@ -35,7 +35,6 @@
 #include "client/file_sync_client.h"
 #include "commandline.h"
 #include "fastdeploy.h"
-#include "sysdeps.h"
 
 static constexpr int kFastDeployMinApi = 24;
 
@@ -161,17 +160,23 @@
 
     if (use_fastdeploy == true) {
         TemporaryFile metadataTmpFile;
-        TemporaryFile patchTmpFile;
+        std::string patchTmpFilePath;
+        {
+            TemporaryFile patchTmpFile;
+            patchTmpFile.DoNotRemove();
+            patchTmpFilePath = patchTmpFile.path;
+        }
 
         FILE* metadataFile = fopen(metadataTmpFile.path, "wb");
         extract_metadata(file, metadataFile);
         fclose(metadataFile);
 
-        create_patch(file, metadataTmpFile.path, patchTmpFile.path);
+        create_patch(file, metadataTmpFile.path, patchTmpFilePath.c_str());
         // pass all but 1st (command) and last (apk path) parameters through to pm for
         // session creation
         std::vector<const char*> pm_args{argv + 1, argv + argc - 1};
-        install_patch(file, patchTmpFile.path, pm_args.size(), pm_args.data());
+        install_patch(file, patchTmpFilePath.c_str(), pm_args.size(), pm_args.data());
+        adb_unlink(patchTmpFilePath.c_str());
         delete_device_patch_file(file);
         return 0;
     } else {