core: update from upstream
Followed instructions from go/nnapi-dep-instructions.
No manual changes / interventions have been made.
BUG=b:197814725
TEST=none, this gets tested when manually uprevving the package
Change-Id: I36b77496b85357369204bdb1ac1efd23acb0c214
NOKEYCHECK=True
GitOrigin-RevId: 77736a8118e750db8fadd6d196814f46e2624c30
diff --git a/Android.bp b/Android.bp
index 0b4b640..3f9aeb2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,11 +85,11 @@
srcs: ["simg_dump.py"],
version: {
py2: {
- embedded_launcher: true,
- enabled: true,
+ enabled: false,
},
py3: {
- enabled: false,
+ embedded_launcher: true,
+ enabled: true,
},
},
}
diff --git a/simg_dump.py b/simg_dump.py
index 82a03ad..b0b3b22 100755
--- a/simg_dump.py
+++ b/simg_dump.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
# Copyright (C) 2012 The Android Open Source Project
#
@@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import print_function
import csv
import getopt
import hashlib
@@ -47,7 +46,7 @@
opts, args = getopt.getopt(sys.argv[1:],
"vsc:",
["verbose", "showhash", "csvfile"])
- except getopt.GetoptError, e:
+ except getopt.GetoptError as e:
print(e)
usage(me)
for o, a in opts:
