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

Commit 6fd4524d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "sign_target_files_apks: replacing GKI signing args completely" am: dcadb680 

Original change: https://android-review.googlesource.com/c/platform/build/+/1700885

Change-Id: I259b543faccb0a37067f61d34c7573deac2a4980
parents 834dc90b dcadb680

tools/releasetools/sign_target_files_apks.py

+2 −3
Original line number Diff line number Diff line
@@ -1033,9 +1033,8 @@ def ReplaceGkiSigningKey(misc_info): 


  extra_args = OPTIONS.gki_signing_extra_args

  if extra_args:

    print('Setting extra GKI signing args: "%s"' % (extra_args))

    misc_info["gki_signing_signature_args"] = (

        misc_info.get("gki_signing_signature_args", '') + ' ' + extra_args)

    print('Setting GKI signing args: "%s"' % (extra_args))

    misc_info["gki_signing_signature_args"] = extra_args





def BuildKeyMap(misc_info, key_mapping_options):

tools/releasetools/test_sign_target_files_apks.py

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te 
    expected_dict = {

        'gki_signing_key_path': 'release_gki_key',

        'gki_signing_algorithm': 'release_gki_algorithm',

        'gki_signing_signature_args': 'default_gki_signature_args release_gki_signature_extra_args',

        'gki_signing_signature_args': 'release_gki_signature_extra_args',

    }

    ReplaceGkiSigningKey(misc_info)

    self.assertDictEqual(expected_dict, misc_info)