zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate uninstalling previous versions into AAR release script.

Browse Source 
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 <ehmaldonado@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21717}
This commit is contained in:
Sami Kalliomäki
2018-01-22 15:08:24 +01:00
committed by Commit Bot
parent 1175ecd095
commit 91e26fd94e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools_webrtc/android/release_aar.py
View File

@ -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.