scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #81 from JoeSSS/JoeSSS-patch-1

Browse source 
Support for Android 8.0 and 8.1
This commit is contained in:
Budi Utomo 2018-07-05 15:32:59 +02:00 committed by GitHub
parent 7e0a2e4770 0b7ca97939
commit bc5635ed0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/Emulator_x86
View file

@ -86,7 +86,7 @@ RUN wget -nv -O noVNC.zip "https://github.com/kanaka/noVNC/archive/${NOVNC_SHA}
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 \
@ -98,10 +98,6 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
RUN yes | sdkmanager --licenses && \
sdkmanager "platforms;android-${API_LEVEL}" "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}" "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

8
release.sh
View file

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

2
src/app.py
View file

@ -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())