Minor updates to startup scripts
Change-Id: Ib18c5a2997090d76dff48a69fb3f8521393b8b5d
diff --git a/tools/startup/adb_utils.py b/tools/startup/adb_utils.py
index d712ed5..d4f70a1 100755
--- a/tools/startup/adb_utils.py
+++ b/tools/startup/adb_utils.py
@@ -248,6 +248,10 @@
screen_off_timeout = int(stdout)
return screen_off_timeout
+def grant(app_id, permission, device_id=None):
+ cmd = create_adb_cmd('shell pm grant %s %s' % (app_id, permission), device_id)
+ subprocess.check_call(cmd)
+
def install(apk, device_id=None):
print('Installing %s' % apk)
cmd = create_adb_cmd('install %s' % apk, device_id)
diff --git a/tools/startup/measure_startup.py b/tools/startup/measure_startup.py
index 99f988d..57f6cb4 100755
--- a/tools/startup/measure_startup.py
+++ b/tools/startup/measure_startup.py
@@ -11,15 +11,6 @@
import sys
import time
-try:
- from perfetto.trace_processor import TraceProcessor
-except ImportError:
- sys.exit(
- 'Unable to analyze perfetto trace without the perfetto library. '
- 'Install instructions:\n'
- ' sudo apt install python3-pip\n'
- ' pip3 install perfetto')
-
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import adb_utils
@@ -95,6 +86,13 @@
os.makedirs(out_dir, exist_ok=True)
+ # Grant notifications.
+ if options.grant_post_notification_permission:
+ adb_utils.grant(
+ options.app_id,
+ 'android.permission.POST_NOTIFICATIONS',
+ options.device_id)
+
# AOT compile.
if options.aot:
print('AOT compiling')
@@ -215,7 +213,7 @@
fully_drawn_time = get_timestamp_from_logcat_message(line)
assert displayed_time is not None
assert fully_drawn_time is not None
- assert fully_drawn_time > displayed_time
+ assert fully_drawn_time >= displayed_time
return fully_drawn_time - displayed_time
def get_timestamp_from_logcat_message(line):
@@ -283,6 +281,7 @@
# Perfetto stats.
perfetto_startup_data = {}
if options.perfetto:
+ TraceProcessor = perfetto_utils.get_trace_processor()
trace_processor = TraceProcessor(file_path=perfetto_trace_path)
# Compute time to first frame according to the builtin android_startup
@@ -358,6 +357,11 @@
result.add_argument('--fully-drawn-logcat-message',
help='Logcat message that indicates that the app is '
'fully drawn (regexp)')
+ result.add_argument('--grant-post-notification-permission',
+ help='Grants the android.permission.POST_NOTIFICATIONS '
+ 'permission before launching the app',
+ default=False,
+ action='store_true')
result.add_argument('--hot-startup',
help='Measure hot startup instead of cold startup',
default=False,
diff --git a/tools/startup/perfetto_utils.py b/tools/startup/perfetto_utils.py
index d2f53b4..eb32722 100644
--- a/tools/startup/perfetto_utils.py
+++ b/tools/startup/perfetto_utils.py
@@ -7,14 +7,16 @@
import subprocess
import sys
-try:
- from perfetto.trace_processor import TraceProcessor
-except ImportError:
- sys.exit(
- 'Unable to analyze perfetto trace without the perfetto library. '
- 'Install instructions:\n'
- ' sudo apt install python3-pip\n'
- ' pip3 install perfetto')
+def get_trace_processor():
+ try:
+ from perfetto.trace_processor import TraceProcessor
+ except ImportError:
+ sys.exit(
+ 'Unable to analyze perfetto trace without the perfetto library. '
+ 'Install instructions:\n'
+ ' sudo apt install python3-pip\n'
+ ' pip3 install perfetto')
+ return TraceProcessor
def ensure_record_android_trace(tmp_dir):
record_android_trace_path = os.path.join(tmp_dir, 'record_android_trace')
diff --git a/tools/startup/relayout.py b/tools/startup/relayout.py
index fee91aa..b0f8aac 100755
--- a/tools/startup/relayout.py
+++ b/tools/startup/relayout.py
@@ -38,8 +38,7 @@
help='Destination of resulting apk',
required=True)
result.add_argument('--profile',
- help='Path to the startup profile',
- required=True)
+ help='Path to the startup profile')
options, args = result.parse_known_args(argv)
return options, args
@@ -74,9 +73,10 @@
'--min-api',
str(max(apk_utils.get_min_api(options.apk), LOWEST_SUPPORTED_MIN_API)),
'--output', dex,
- '--startup-profile', options.profile,
'--no-desugaring',
'--release']
+ if options.profile:
+ d8_args.extend(['--startup-profile', options.profile])
dex_to_relayout, desugared_library_dex = get_dex_to_relayout(options, temp)
d8_args.extend(dex_to_relayout)
toolhelper.run(
