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

Commit 4d38a0f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libsparse: python3." am: 2201ccfe am: 7d9fd875 am: eb066f63 am:... 

Merge "libsparse: python3." am: 2201ccfe am: 7d9fd875 am: eb066f63 am: ab8f822e am: 3a9d52fa

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1798338

Change-Id: I61069e936aa7996ed3b234a98c1c51af277f4acd
parents fb9b27a1 3a9d52fa

libsparse/Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -85,11 +85,11 @@ python_binary_host { 
    srcs: ["simg_dump.py"],

    srcs: ["simg_dump.py"],

    version: {

    version: {

        py2: {

        py2: {

            embedded_launcher: true,

            enabled: false,

            enabled: true,

        },

        },

        py3: {

        py3: {

            enabled: false,

            embedded_launcher: true,

            enabled: true,

        },

        },

    },

    },

}

}

libsparse/simg_dump.py

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

#! /usr/bin/env python3





# Copyright (C) 2012 The Android Open Source Project

# Copyright (C) 2012 The Android Open Source Project

#

#
@@ -14,7 +14,6 @@ 
# See the License for the specific language governing permissions and

# See the License for the specific language governing permissions and

# limitations under the License.

# limitations under the License.





from __future__ import print_function

import csv

import csv

import getopt

import getopt

import hashlib

import hashlib
@@ -47,7 +46,7 @@ def main(): 
    opts, args = getopt.getopt(sys.argv[1:],

    opts, args = getopt.getopt(sys.argv[1:],

                               "vsc:",

                               "vsc:",

                               ["verbose", "showhash", "csvfile"])

                               ["verbose", "showhash", "csvfile"])

  except getopt.GetoptError, e:

  except getopt.GetoptError as e:

    print(e)

    print(e)

    usage(me)

    usage(me)

  for o, a in opts:

  for o, a in opts: