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

Commit aa82bd62 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Fix one missing case for --oem_no_mount." 

am: 4e677900

* commit '4e677900':
  releasetools: Fix one missing case for --oem_no_mount.
parents be816201 4e677900

tools/releasetools/ota_from_target_files.py

+2 −1
Original line number Original line Diff line number Diff line
@@ -1424,6 +1424,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): 
  if oem_props is not None and len(oem_props) > 0:

  if oem_props is not None and len(oem_props) > 0:

    if OPTIONS.oem_source is None:

    if OPTIONS.oem_source is None:

      raise common.ExternalError("OEM source required for this build")

      raise common.ExternalError("OEM source required for this build")

    if not OPTIONS.oem_no_mount:

      script.Mount("/oem", recovery_mount_options)

      script.Mount("/oem", recovery_mount_options)

    oem_dict = common.LoadDictionaryFromLines(

    oem_dict = common.LoadDictionaryFromLines(

        open(OPTIONS.oem_source).readlines())

        open(OPTIONS.oem_source).readlines())