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

Commit 79f73eea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Switch care_map_generator.py to Python 3." am: f2e577ed 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1606758

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8549330bbd65ef7092e9892ea668a59e0ccbef34
parents fea7439a f2e577ed

update_verifier/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -121,12 +121,12 @@ python_binary_host { 


    version: {

        py2: {

            enabled: true,

            embedded_launcher: true,

        },

        py3: {

            enabled: false,

            embedded_launcher: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}

update_verifier/care_map_generator.py

+3 −3
Original line number Diff line number Diff line 
#!/usr/bin/env python

#!/usr/bin/env python3

#

# Copyright (C) 2018 The Android Open Source Project

#
@@ -115,13 +115,13 @@ def main(argv): 
    content = input_care_map.read()



  if args.parse_proto:

    result = ParseProtoMessage(content, args.fingerprint_enabled)

    result = ParseProtoMessage(content, args.fingerprint_enabled).encode()

  else:

    care_map_proto = GenerateCareMapProtoFromLegacyFormat(

        content.rstrip().splitlines(), args.fingerprint_enabled)

    result = care_map_proto.SerializeToString()



  with open(args.output_file, 'w') as output:

  with open(args.output_file, 'wb') as output:

    output.write(result)