Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94919cd3 authored by Doug Zongker's avatar Doug Zongker
Browse files

take bootable images from target_files if present 

Now that we're building and saving images in the target_files at build
time, we should use those images instead of rebuilding them.

Bug: 17201052
Change-Id: I435056df1b61a3c06014208363966f973a44a887
parent 7db43c89

tools/releasetools/common.py

+17 −11
Original line number Diff line number Diff line
@@ -355,14 +355,20 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 
                     info_dict=None):

  """Return a File object (with name 'name') with the desired bootable

  image.  Look for it in 'unpack_dir'/BOOTABLE_IMAGES under the name

  'prebuilt_name', otherwise construct it from the source files in

  'prebuilt_name', otherwise look for it under 'unpack_dir'/IMAGES,

  otherwise construct it from the source files in

  'unpack_dir'/'tree_subdir'."""



  prebuilt_path = os.path.join(unpack_dir, "BOOTABLE_IMAGES", prebuilt_name)

  if os.path.exists(prebuilt_path):

    print "using prebuilt %s..." % (prebuilt_name,)

    print "using prebuilt %s from BOOTABLE_IMAGES..." % (prebuilt_name,)

    return File.FromLocalFile(name, prebuilt_path)

  else:



  prebuilt_path = os.path.join(unpack_dir, "IMAGES", prebuilt_name)

  if os.path.exists(prebuilt_path):

    print "using prebuilt %s from IMAGES..." % (prebuilt_name,)

    return File.FromLocalFile(name, prebuilt_path)



  print "building image from target_files %s..." % (tree_subdir,)

  fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"

  data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),