Merge "Make sure we do not take the profile report for buildSrc"
diff --git a/tools/as_utils.py b/tools/as_utils.py
index a5bfffe..83d0d15 100644
--- a/tools/as_utils.py
+++ b/tools/as_utils.py
@@ -171,12 +171,13 @@
def MoveProfileReportTo(dest_dir, build_stdout, quiet=False):
html_file = None
profile_message = 'See the profiling report at: '
+ # We are not interested in the profiling report for buildSrc.
for line in build_stdout:
- if profile_message in line:
+ if (profile_message in line) and ('buildSrc' not in line):
+ assert not html_file, "Only one report should be created"
html_file = line[len(profile_message):]
if html_file.startswith('file://'):
html_file = html_file[len('file://'):]
- break
if not html_file:
return
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index ec1a777..5596cd5 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -250,7 +250,6 @@
'module': '',
'flavor': 'play',
'main_dex_rules': 'multidex-config.pro',
- 'releaseTarget': 'assemblePlayRelease',
'signed_apk_name': 'Signal-play-release-4.32.7.apk'
})
]
@@ -679,8 +678,7 @@
app, repo, options, checkout_dir, temp_dir, shrinker, proguard_config_file):
recompilation_results = []
- # Build app with gradle using -D...keepRuleSynthesisForRecompilation=
- # true.
+ # Build app with gradle using -D...keepRuleSynthesisForRecompilation=true.
out_dir = os.path.join(checkout_dir, 'out', shrinker + '-1')
(apk_dest, profile_dest_dir, ext_proguard_config_file) = \
BuildAppWithShrinker(
