Add temporary hack to help with merge resolution.

Change-Id: I1207daf17c2bd3f7f18e35a7705635752535942f

1 files changed, 0 insertions, 53 deletions

diff --git a/tools/releasetools/make_recovery_patch.py b/tools/releasetools/make_recovery_patch.py
deleted file mode 100755
index 08d1450..0000000
--- a/tools/releasetools/make_recovery_patch.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (C) 2014 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-
-if sys.hexversion < 0x02070000:
-  print >> sys.stderr, "Python 2.7 or newer is required."
-  sys.exit(1)
-
-import os
-import common
-
-OPTIONS = common.OPTIONS
-
-def main(argv):
-  # def option_handler(o, a):
-  #   return False
-
-  args = common.ParseOptions(argv, __doc__)
-  input_dir, output_dir = args
-
-  OPTIONS.info_dict = common.LoadInfoDict(input_dir)
-
-  recovery_img = common.GetBootableImage("recovery.img", "recovery.img",
-                                         input_dir, "RECOVERY")
-  boot_img = common.GetBootableImage("boot.img", "boot.img",
-                                     input_dir, "BOOT")
-
-  if not recovery_img or not boot_img:
-    sys.exit(0)
-
-  def output_sink(fn, data):
-    with open(os.path.join(output_dir, "SYSTEM", *fn.split("/")), "wb") as f:
-      f.write(data)
-
-  common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
-
-
-if __name__ == '__main__':
-  main(sys.argv[1:])