Added adb timeouts.| #1116

FlowCrypt · Apr 2, 2021 · 2933f7b · 2933f7b
1 parent 5a0a96c
commit 2933f7b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -17,6 +17,8 @@ auto_cancel:
 
 global_job_config:
   env_vars:
+    - name: ADB_INSTALL_TIMEOUT #https://android.googlesource.com/platform/tools/base/+/bc733f18ec99fe5e14804ec062edc98039d67685/ddmlib/src/main/java/com/android/ddmlib/Device.java#88
+      value: "10"
     - name: SEMAPHORE_GIT_DIR
       value: /home/semaphore/git/flowcrypt-android
     - name: ANDROID_SDK_ROOT

diff --git a/FlowCrypt/build.gradle b/FlowCrypt/build.gradle
@@ -3,8 +3,13 @@
  * Contributors: DenBond7
  */
 
+import com.android.ddmlib.DdmPreferences
+
 import java.text.SimpleDateFormat
 
+//Setting global timeout for apk installation to 10 minutes. We need it for CI
+DdmPreferences.setTimeOut(10 * 60 * 1000)
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
@@ -300,6 +305,10 @@ android {
     }
 
     ndkVersion "22.0.7026061"
+
+    adbOptions {
+        timeOutInMs 60 * 1000 // Set timeout to 60 seconds. We need it for CI.
+    }
 }
 
 configurations {