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

Commit df4cb0b2 authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Add --oem_no_mount option. 

We may have devices with OEM-specific properties but without an OEM
partition (e.g. the properties might be set by init based on hardware
SKUs). For such devices, we supply --oem_no_mount to skip mounting the
OEM partition in the updater-script. The option is only meaningful when
-o (--oem_settings) is specified.

Bug: 27359929
Change-Id: Ic08396e478a82be4188e980e704b33b4f704a8d7
(cherry picked from commit 8608cde9)
parent e511a076

tools/releasetools/edify_generator.py

+11 −5
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ class EdifyGenerator(object): 
      raise ValueError("must specify an OEM property")

    if not value:

      raise ValueError("must specify the OEM value")

    if common.OPTIONS.oem_no_mount:

      cmd = ('getprop("{name}") == "{value}" || '

             'abort("This package expects the value \\"{value}\\" for '

             '\\"{name}\\"; this has value \\"" + '

             'getprop("{name}") + "\\".");').format(name=name, value=value)

    else:

      cmd = ('file_getprop("/oem/oem.prop", "{name}") == "{value}" || '

             'abort("This package expects the value \\"{value}\\" for '

             '\\"{name}\\" on the OEM partition; this has value \\"" + '

tools/releasetools/ota_from_target_files.py

+24 −1
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
      Use the file to specify the expected OEM-specific properties

      on the OEM partition of the intended device.



  --oem_no_mount

      For devices with OEM-specific properties but without an OEM partition,

      do not mount the OEM partition in the updater-script. This should be

      very rarely used, since it's expected to have a dedicated OEM partition

      for OEM-specific properties. Only meaningful when -o is specified.



  -w  (--wipe_user_data)

      Generate an OTA package that will wipe the user data partition

      when installed.
@@ -128,6 +134,7 @@ OPTIONS.no_signing = False 
OPTIONS.block_based = False

OPTIONS.updater_binary = None

OPTIONS.oem_source = None

OPTIONS.oem_no_mount = False

OPTIONS.fallback_to_full = True

OPTIONS.full_radio = False

OPTIONS.full_bootloader = False
@@ -509,6 +516,7 @@ def WriteFullOTAPackage(input_zip, output_zip): 
  if oem_props is not None and len(oem_props) > 0:

    if OPTIONS.oem_source is None:

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

    if not OPTIONS.oem_no_mount:

      script.Mount("/oem", recovery_mount_options)

    oem_dict = common.LoadDictionaryFromLines(

        open(OPTIONS.oem_source).readlines())
@@ -744,6 +752,18 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): 
      source_version, OPTIONS.target_info_dict,

      fstab=OPTIONS.source_info_dict["fstab"])



  oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties")

  recovery_mount_options = OPTIONS.source_info_dict.get(

      "recovery_mount_options")

  oem_dict = None

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

    if OPTIONS.oem_source is None:

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

    if not OPTIONS.oem_no_mount:

      script.Mount("/oem", recovery_mount_options)

    oem_dict = common.LoadDictionaryFromLines(

        open(OPTIONS.oem_source).readlines())



  metadata = {

      "pre-device": GetBuildProp("ro.product.device",

                                 OPTIONS.source_info_dict),
@@ -1519,6 +1539,8 @@ def main(argv): 
      OPTIONS.omit_prereq = True

    elif o in ("-o", "--oem_settings"):

      OPTIONS.oem_source = a

    elif o == "--oem_no_mount":

      OPTIONS.oem_no_mount = True

    elif o in ("-e", "--extra_script"):

      OPTIONS.extra_script = a

    elif o in ("-a", "--aslr_mode"):
@@ -1572,6 +1594,7 @@ def main(argv): 
                                 "block",

                                 "binary=",

                                 "oem_settings=",

                                 "oem_no_mount",

                                 "verify",

                                 "no_fallback_to_full",

                                 "stash_threshold=",