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

Commit eb0a78af authored by Doug Zongker's avatar Doug Zongker
Browse files

prefer releasetools.py from target_files zip 

If the target_files zip for the target build contains a
META/releasetools.py (which it has since Nov 2013), prefer that over
using a releasetools.py from the local client.

Explicitly specifying the device-specific extensions path via
command-line options takes priority over both of the above mechanisms.

Change-Id: Ia068b0e2e06ede7da89ebe4315cdec592eb8995e
parent f6c0e042

tools/releasetools/common.py

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ class DeviceSpecificParams(object): 
          if x == ".py":

            f = b

          info = imp.find_module(f, [d])

        print "loaded device-specific extensions from", path

        self.module = imp.load_module("device_specific", *info)

      except ImportError:

        print "unable to load device-specific module; assuming none"

tools/releasetools/ota_from_target_files

+15 −3
Original line number Diff line number Diff line
@@ -1011,11 +1011,23 @@ def main(argv): 
    print "--- target info ---"

    common.DumpInfoDict(OPTIONS.info_dict)



  # If the caller explicitly specified the device-specific extensions

  # path via -s/--device_specific, use that.  Otherwise, use

  # META/releasetools.py if it is present in the target target_files.

  # Otherwise, take the path of the file from 'tool_extensions' in the

  # info dict and look for that in the local filesystem, relative to

  # the current directory.



  if OPTIONS.device_specific is None:

    from_input = os.path.join(OPTIONS.input_tmp, "META", "releasetools.py")

    if os.path.exists(from_input):

      print "(using device-specific extensions from target_files)"

      OPTIONS.device_specific = from_input

    else:

      OPTIONS.device_specific = OPTIONS.info_dict.get("tool_extensions", None)



  if OPTIONS.device_specific is not None:

    OPTIONS.device_specific = os.path.normpath(OPTIONS.device_specific)

    print "using device-specific extensions in", OPTIONS.device_specific

    OPTIONS.device_specific = os.path.abspath(OPTIONS.device_specific)



  temp_zip_file = tempfile.NamedTemporaryFile()

  output_zip = zipfile.ZipFile(temp_zip_file, "w",