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

Commit 3c7374a3 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 5f0700d9 ff39732f

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



BUILD_ID=TQ1A.230105.001.A2
 
BUILD_ID=TQ1A.230205.002

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

    PLATFORM_SECURITY_PATCH := 2023-01-05

    PLATFORM_SECURITY_PATCH := 2023-02-05

endif



include $(BUILD_SYSTEM)/version_util.mk

tools/releasetools/sign_target_files_apks.py

+14 −5
Original line number Diff line number Diff line
@@ -99,14 +99,14 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files 
      The second dir will be used for lookup if BOARD_USES_RECOVERY_AS_BOOT is

      set to true.



  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,

         vbmeta_vendor}_algorithm <algorithm>

  --avb_{boot,recovery,system,system_other,vendor,dtbo,vbmeta,vbmeta_system,

         vbmeta_vendor}_key <key>

  --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_algorithm <algorithm>

  --avb_{boot,init_boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_key <key>

      Use the specified algorithm (e.g. SHA256_RSA4096) and the key to AVB-sign

      the specified image. Otherwise it uses the existing values in info dict.



  --avb_{apex,boot,recovery,system,system_other,vendor,dtbo,vbmeta,

  --avb_{apex,init_boot,boot,recovery,system,system_other,vendor,dtbo,vbmeta,

         vbmeta_system,vbmeta_vendor}_extra_args <args>

      Specify any additional args that are needed to AVB-sign the image

      (e.g. "--signing_helper /path/to/helper"). The args will be appended to
@@ -1429,6 +1429,12 @@ def main(argv): 
      OPTIONS.avb_algorithms['dtbo'] = a

    elif o == "--avb_dtbo_extra_args":

      OPTIONS.avb_extra_args['dtbo'] = a

    elif o == "--avb_init_boot_key":

      OPTIONS.avb_keys['init_boot'] = a

    elif o == "--avb_init_boot_algorithm":

      OPTIONS.avb_algorithms['init_boot'] = a

    elif o == "--avb_init_boot_extra_args":

      OPTIONS.avb_extra_args['init_boot'] = a

    elif o == "--avb_recovery_key":

      OPTIONS.avb_keys['recovery'] = a

    elif o == "--avb_recovery_algorithm":
@@ -1520,6 +1526,9 @@ def main(argv): 
          "avb_dtbo_algorithm=",

          "avb_dtbo_key=",

          "avb_dtbo_extra_args=",

          "avb_init_boot_algorithm=",

          "avb_init_boot_key=",

          "avb_init_boot_extra_args=",

          "avb_recovery_algorithm=",

          "avb_recovery_key=",

          "avb_recovery_extra_args=",