diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-23 02:33:12 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-23 02:33:12 +0000 |
| commit | 91b8da9d0822fc0610deadc9d6e9e0a9482e3e14 (patch) | |
| tree | fe7f6f6171d4fdd6ad6b93a78248dcd4ac638525 | |
| parent | f11effe3ef4b0cf58bf63cecee6823d81a6f3da4 (diff) | |
| parent | cc2aa189ae1dd7007e7b6956c27a77cd6a185ee7 (diff) | |
| download | platform_tools_test_connectivity-oreo-mr1-vts-release.tar.gz platform_tools_test_connectivity-oreo-mr1-vts-release.tar.bz2 platform_tools_test_connectivity-oreo-mr1-vts-release.zip | |
Snap for 4411005 from cc2aa189ae1dd7007e7b6956c27a77cd6a185ee7 to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release
Change-Id: Id9e7052adc6ca6a9e8d17213b53e22733b5df1f2
| -rw-r--r-- | acts/framework/acts/libs/ota/ota_runners/ota_runner.py | 2 | ||||
| -rw-r--r-- | acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/acts/framework/acts/libs/ota/ota_runners/ota_runner.py b/acts/framework/acts/libs/ota/ota_runners/ota_runner.py index dd58943ea1..776c9008a1 100644 --- a/acts/framework/acts/libs/ota/ota_runners/ota_runner.py +++ b/acts/framework/acts/libs/ota/ota_runners/ota_runner.py @@ -42,7 +42,7 @@ class OtaRunner(object): logging.info('Boot completed. Rooting adb.') self.android_device.root_adb() logging.info('Root complete. Installing new SL4A.') - output = self.android_device.adb.install('-r %s' % self.get_sl4a_apk) + output = self.android_device.adb.install('-r %s' % self.get_sl4a_apk()) logging.info('SL4A install output: %s' % output) time.sleep(SL4A_SERVICE_SETUP_TIME) logging.info('Starting services.') diff --git a/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py b/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py index 0ab9091f99..978842ffb7 100644 --- a/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py +++ b/acts/framework/acts/libs/ota/ota_tools/update_device_ota_tool.py @@ -43,8 +43,8 @@ class UpdateDeviceOtaTool(ota_tool.OtaTool): def update(self, ota_runner): logging.info('Forcing adb to be in root mode.') ota_runner.android_device.root_adb() - update_command = '%s -s %s %s' % (self.command, ota_runner.serial, - ota_runner.get_ota_package()) + update_command = 'python2.7 %s -s %s %s' % ( + self.command, ota_runner.serial, ota_runner.get_ota_package()) logging.info('Running %s' % update_command) result = job.run(update_command, timeout=UPDATE_TIMEOUT) logging.info('Output: %s' % result.stdout) |