commit 56a088eded3be1fde86ae471c583483881c0a013
author Alex Deymo <deymo@chromium.org> Mon Jul 20 12:15:21 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Jul 21 19:56:25 2015 +0000
tree 8fd3294cc0c24375f6069e0dce715688c4dc5cfd
parent 896fdbaa1cc9a422ac36ef455d02c3cef1f27816

update_engine: Remove deprecated flags.

These flags are not passed from cros_generate_update_payload anymore.

BUG=chromium:305832
TEST=`cros_generate_update_payload --old_image $FOO --image $BAR` still
works.

Change-Id: I6fb009de677398b28ed09146d5f7c9877efd4210
Reviewed-on: https://chromium-review.googlesource.com/286890
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>

payload_generator/generate_delta_main.cc

diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 170a612..d32221d 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -217,12 +217,6 @@
 }
 
 int Main(int argc, char** argv) {
-  DEFINE_string(old_dir, "",
-                "[DEPRECATED] Directory where the old rootfs is loop mounted "
-                "read-only. Not required anymore.");
-  DEFINE_string(new_dir, "",
-                "[DEPRECATED] Directory where the new rootfs is loop mounted "
-                "read-only. Not required anymore.");
   DEFINE_string(old_image, "", "Path to the old rootfs");
   DEFINE_string(new_image, "", "Path to the new rootfs");
   DEFINE_string(old_kernel, "", "Path to the old kernel partition image");
@@ -312,14 +306,6 @@
 
   logging::InitLogging(log_settings);
 
-  // Check flags.
-  if (!FLAGS_old_dir.empty()) {
-    LOG(INFO) << "--old_dir flag is deprecated and ignored.";
-  }
-  if (!FLAGS_new_dir.empty()) {
-    LOG(INFO) << "--new_dir flag is deprecated and ignored.";
-  }
-
   vector<int> signature_sizes;
   ParseSignatureSizes(FLAGS_signature_size, &signature_sizes);