commit f085793d2b46654a0523461270bedfb8a5609c7e
author Jaegeuk Kim <jaegeuk@google.com> Fri Dec 08 01:20:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 08 01:20:11 2017 +0000
tree 0f5e8b9bb1c33b55190a1b07a859d54a57ec1e81
parent 5e650fd49adb0743b98e2eebf2ef7d052bf227fd
parent 566ef616e93e727a202975b931bced253b4434b7

Merge "fastboot: support make_f2fs and sload_f2fs for win32" am: cf27dbacaf
am: 94d8aaf9f6

Change-Id: Id0aca050aa93bb6579e98ca07b7d5ecf50ab503b

fastboot/fs.cpp

diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp
index 9db710d..a1e1677 100644
--- a/fastboot/fs.cpp
+++ b/fastboot/fs.cpp
@@ -165,7 +165,6 @@
 static int generate_f2fs_image(const char* fileName, long long partSize, const std::string& initial_dir,
                                unsigned /* unused */, unsigned /* unused */)
 {
-#ifndef WIN32
     const std::string exec_dir = android::base::GetExecutableDirectory();
     const std::string mkf2fs_path = exec_dir + "/make_f2fs";
     std::vector<const char*> mkf2fs_args = {mkf2fs_path.c_str()};
@@ -195,11 +194,6 @@
                                        "-f", initial_dir.c_str(), fileName, nullptr};
 
     return exec_cmd(sload_args[0], sload_args.data(), nullptr);
-#else
-    UNUSED(fileName, partSize, initial_dir);
-    fprintf(stderr, "generate_f2fs_image: Not supported on Windows\n");
-    return -1;
-#endif
 }
 
 static const struct fs_generator {