Reland: Android: Use a .json file to record incremental install details
This reverts commit 6f34424ff93b31f73b481b7e04ebba0e675983a3.
Reason for reland: Fixes test run scripts
With the recent addition of apk wrapper scripts, the
bin/install_foo_incremental scripts are now just confusing.
This changes them to instead be .json files.
Change-Id: I32b29b7a464697004b5d7eda57cc04e61a81d763
No-Try: true
Bug: 749239
Reviewed-on: https://chromium-review.googlesource.com/612190
Reviewed-by: John Budorick <[email protected]>
Reviewed-by: Andrew Grieve <[email protected]>
Commit-Queue: Andrew Grieve <[email protected]>
Cr-Commit-Position: refs/heads/master@{#493844}diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index 9e4e19a..bb1dbb9 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -281,14 +281,14 @@
self._exe_dist_dir = exe_dist_dir
incremental_part = ''
- if args.test_apk_incremental_install_script:
+ if args.test_apk_incremental_install_json:
incremental_part = '_incremental'
apk_path = os.path.join(
constants.GetOutDirectory(), '%s_apk' % self._suite,
'%s-debug%s.apk' % (self._suite, incremental_part))
- self._test_apk_incremental_install_script = (
- args.test_apk_incremental_install_script)
+ self._test_apk_incremental_install_json = (
+ args.test_apk_incremental_install_json)
if not os.path.exists(apk_path):
self._apk_helper = None
else:
@@ -423,8 +423,8 @@
return self._suite
@property
- def test_apk_incremental_install_script(self):
- return self._test_apk_incremental_install_script
+ def test_apk_incremental_install_json(self):
+ return self._test_apk_incremental_install_json
@property
def total_external_shards(self):
