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

Commit bcae74de authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

sign_target_files_apks: replacing GKI signing args completely 

Commit I8bd8ad3acf324931b47d45fd30bc590206b1927e adds a default
value of "gki_signing_signature_args" in the misc_info.txt for
release signing to work. However, it's better to replace the default
value entirely (e.g., --prop foo:bar) as there is no need to include
them in the final release-signed image.

Bug: 178559811
Bug: 177862434
Test: atest releasetools_test
Test: atest releasetools_py3_test
Change-Id: I060b5a7076ff3e5d883abeb7d72f3db887c9fd69
parent 6fa22ce3

tools/releasetools/sign_target_files_apks.py

+2 −3
Original line number Diff line number Diff line
@@ -1029,9 +1029,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)