From 59f61e057e17c303ffb68851ea3b3ada0e189743 Mon Sep 17 00:00:00 2001
From: Serghei Moret <joesatriani323@gmail.com>
Date: Tue, 3 Jul 2018 20:44:13 +0200
Subject: [PATCH 1/3] Update Emulator_x86

---
 docker/Emulator_x86 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index 67deacb..ffb8a1c 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -83,8 +83,8 @@ RUN  wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
 #======================
 # Install SDK packages
 #======================
-ARG ANDROID_VERSION=5.0.1
-ARG API_LEVEL=21
+ARG ANDROID_VERSION=8.0
+ARG API_LEVEL=26
 ARG PROCESSOR=x86
 ARG SYS_IMG=x86_64
 ARG IMG_TYPE=google_apis
@@ -99,10 +99,6 @@ ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
 RUN echo y | sdkmanager "platforms;android-${API_LEVEL}" && \
     echo y | sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}" && \
     echo y | sdkmanager "emulator"
-RUN rm ${ANDROID_HOME}/tools/emulator \
- && ln -s ${ANDROID_HOME}/emulator/emulator64-${PROCESSOR} ${ANDROID_HOME}/tools/emulator
-ENV LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$ANDROID_HOME/emulator/lib64/qt/lib
-
 
 #==============================================
 #       Download chrome driver v2.26

From d176e69cc1fc239dfc40d5974c4d52692721ecb9 Mon Sep 17 00:00:00 2001
From: Serghei Moret <joesatriani323@gmail.com>
Date: Tue, 3 Jul 2018 20:46:23 +0200
Subject: [PATCH 2/3] Let default emulator pick the right kernel

---
 src/app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app.py b/src/app.py
index f309876..1ba4db4 100644
--- a/src/app.py
+++ b/src/app.py
@@ -193,7 +193,7 @@ def run():
     dp_size = os.getenv('DATAPARTITION', '550m')
     with open("/root/android_emulator/config.ini", "a") as cfg:
         cfg.write('\ndisk.dataPartition.size={dp}'.format(dp=dp_size))
-    cmd = 'emulator -avd {name} -gpu off -verbose'.format(name=avd_name)
+    cmd = 'emulator/emulator @{name} -gpu off -verbose'.format(name=avd_name)
     appium = convert_str_to_bool(str(os.getenv('APPIUM', False)))
     if appium:
         subprocess.Popen(cmd.split())

From c82443e221bb93c88ed95987770ae5b6cb8ba6fa Mon Sep 17 00:00:00 2001
From: Serghei Moret <serghei.moret@xing.com>
Date: Thu, 5 Jul 2018 14:29:54 +0200
Subject: [PATCH 3/3] Update release.sh

---
 docker/Emulator_x86 | 6 +++---
 release.sh          | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index ffb8a1c..5c1d0ce 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -83,10 +83,10 @@ RUN  wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
 #======================
 # Install SDK packages
 #======================
-ARG ANDROID_VERSION=8.0
-ARG API_LEVEL=26
+ARG ANDROID_VERSION=5.0.1
+ARG API_LEVEL=21
 ARG PROCESSOR=x86
-ARG SYS_IMG=x86_64
+ARG SYS_IMG=x86
 ARG IMG_TYPE=google_apis
 ARG BROWSER=android
 ENV ANDROID_VERSION=$ANDROID_VERSION \
diff --git a/release.sh b/release.sh
index 220af9b..809f9c6 100755
--- a/release.sh
+++ b/release.sh
@@ -10,7 +10,7 @@ else
 fi
 
 if [ -z "$2" ]; then
-    read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|all): " ANDROID_VERSION
+    read -p "Android version (5.0.1|5.1.1|6.0|7.0|7.1.1|8.0|8.1|all): " ANDROID_VERSION
 else
     ANDROID_VERSION=$2
 fi
@@ -33,11 +33,13 @@ declare -A list_of_levels=(
         [6.0]=23
         [7.0]=24
         [7.1.1]=25
+        [8.0]=26
+        [8.1]=27
 )
 
 declare -A list_of_processors=(
         [arm]=armeabi-v7a
-        [x86]=x86_64
+        [x86]=x86
 )
 
 function get_android_versions() {
@@ -57,7 +59,7 @@ function get_android_versions() {
 
     # If version cannot be found in the list
     if [ -z "$versions" ]; then
-        echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1"
+        echo "Android version \"$ANDROID_VERSION\" is not found in the list or not supported! Support only version 5.0.1, 5.1.1, 6.0, 7.0, 7.1.1, 8.0, 8.1"
         exit 1
     fi