From 91e26fd94e00d362a87da1dab64b0e2c2de579fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Mon, 22 Jan 2018 15:08:24 +0100 Subject: [PATCH] Integrate uninstalling previous versions into AAR release script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows the script to be reliably run on the bots. Bug: webrtc:8365 Change-Id: Ie4f216403c1f4fabe8db07f261fe06d1e64be0ae Reviewed-on: https://webrtc-review.googlesource.com/42720 Reviewed-by: Edward Lemur Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#21717} --- tools_webrtc/android/release_aar.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools_webrtc/android/release_aar.py b/tools_webrtc/android/release_aar.py index c2ae06516a..1e91bf99a4 100644 --- a/tools_webrtc/android/release_aar.py +++ b/tools_webrtc/android/release_aar.py @@ -52,6 +52,8 @@ UPLOAD_TRIES = 3 UPLOAD_RETRY_BASE_SLEEP_SECONDS = 2.0 GRADLEW_BIN = os.path.join(CHECKOUT_ROOT, 'examples/androidtests/third_party/gradle/gradlew') +ADB_BIN = os.path.join(CHECKOUT_ROOT, + 'third_party/android_tools/sdk/platform-tools/adb') AAR_PROJECT_DIR = os.path.join(CHECKOUT_ROOT, 'examples/aarproject') AAR_PROJECT_GRADLE = os.path.join(AAR_PROJECT_DIR, 'build.gradle') AAR_PROJECT_APP_GRADLE = os.path.join(AAR_PROJECT_DIR, 'app', 'build.gradle') @@ -168,6 +170,12 @@ def _TestAAR(tmp_dir, username, password, version): with open(AAR_PROJECT_APP_GRADLE, 'w') as gradle_app_file: gradle_app_file.write(gradle_app) + # Uninstall any existing version of AppRTCMobile. + logging.info('Uninstalling previous AppRTCMobile versions. It is okay for ' + 'these commands to fail if AppRTCMobile is not installed.') + subprocess.call([ADB_BIN, 'uninstall', 'org.appspot.apprtc']) + subprocess.call([ADB_BIN, 'uninstall', 'org.appspot.apprtc.test']) + # Run tests. try: # First clean the project.