commit c449f77ec67dd05b7b63ee85001208a245970bec
author Lalit Maganti <lalitm@google.com> Wed Jun 03 14:20:10 2020 +0100
committer Lalit Maganti <lalitm@google.com> Wed Jun 03 14:20:10 2020 +0100
tree 3e07744b161af43e825abcb717c9940be49e16b5
parent 890735b8c86dde8a30b2c0db1d2fe3d1d9c6ee1e

tp: switch merged metrics script to python3

Change-Id: I2765179dc7851b6a5c59c4a166c1e06be8beda32

BUILD

diff --git a/BUILD b/BUILD
index 7340a49..73c4465 100644
--- a/BUILD
+++ b/BUILD
@@ -3218,7 +3218,7 @@
         "tools/gen_merged_sql_metrics.py",
     ],
     main = "tools/gen_merged_sql_metrics.py",
-    python_version = "PY2",
+    python_version = "PY3",
 )
 
 perfetto_java_proto_library(

BUILD.extras

diff --git a/BUILD.extras b/BUILD.extras
index 6365f5c..6a0c30e 100644
--- a/BUILD.extras
+++ b/BUILD.extras
@@ -19,7 +19,7 @@
         "tools/gen_merged_sql_metrics.py",
     ],
     main = "tools/gen_merged_sql_metrics.py",
-    python_version = "PY2",
+    python_version = "PY3",
 )
 
 perfetto_java_proto_library(

tools/gen_merged_sql_metrics.py

diff --git a/tools/gen_merged_sql_metrics.py b/tools/gen_merged_sql_metrics.py
index 07c57e1..ca2c525 100755
--- a/tools/gen_merged_sql_metrics.py
+++ b/tools/gen_merged_sql_metrics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2019 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");