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

Commit 337633f2 authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Remove '-w' from ota_from_target_files options. 

'-w' is a short option for '--wipe_user_data', which happens to be the
same as the whole-file signing flag for signapk.

This CL removes the short version to make it less error-prone. Users
should use '--wipe_user_data' to generate packages with enforced data
wipe.

Bug: 70259309
Test: ota_from_target_files.py generates packages with and without
      '--wipe_user_data'.
Test: Not seeing active users that uses 'ota_from_target_files -w'.
Change-Id: Ib8c138663a87aafc6a0b5b6f7c286fb74ef6134b
parent 0765d532

tools/releasetools/ota_from_target_files.py

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package 
      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)

  --wipe_user_data

      Generate an OTA package that will wipe the user data partition

      when installed.
@@ -1295,7 +1295,7 @@ def main(argv): 
      OPTIONS.full_radio = True

    elif o == "--full_bootloader":

      OPTIONS.full_bootloader = True

    elif o in ("-w", "--wipe_user_data"):

    elif o == "--wipe_user_data":

      OPTIONS.wipe_user_data = True

    elif o == "--downgrade":

      OPTIONS.downgrade = True
@@ -1347,7 +1347,7 @@ def main(argv): 
    return True



  args = common.ParseOptions(argv, __doc__,

                             extra_opts="b:k:i:d:we:t:2o:",

                             extra_opts="b:k:i:d:e:t:2o:",

                             extra_long_opts=[

                                 "package_key=",

                                 "incremental_from=",