commit 59da2ee4aa6720e5524dfbeaeb57ca07b61ba104
author Tao Bao <tbao@google.com> Thu Dec 01 17:19:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 01 17:19:08 2016 +0000
tree dcac4682445ad480ef1a6b856b32b17212312f0a
parent ba577753545735870dc215ce44f7353d8b2257dc
parent dfff1ac0651eec2e944756f729ea3129f4c37c42

Merge "releasetools: Remove dead parameter in GetBootableImage()." am: 8df4fea85f am: 2e3f1c5258
am: dfff1ac065

Change-Id: I64b0f247c84b53c53f6ad04551264e4fa352f1eb

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index a873181..9928a5a 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -547,7 +547,7 @@
 
 
 def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir,
-                     info_dict=None, system_img_path=None):
+                     info_dict=None):
   """Return a File object with the desired bootable image.
 
   Look for it in 'unpack_dir'/BOOTABLE_IMAGES under the name 'prebuilt_name',