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

Fixed installation issue

Browse source
This commit is contained in:
butomo1989 2017-07-18 14:06:41 +02:00
parent c431118465
commit 1062da3dcc
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/Emulator_arm
View file

@ -82,6 +82,10 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
ENV PATH ${PATH}:${ANDROID_HOME}/build-tools ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
RUN sdkmanager "platforms;android-${API_LEVEL}" RUN sdkmanager "platforms;android-${API_LEVEL}"
RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}" RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}"
RUN 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 # Download chrome driver v2.26

5
docker/Emulator_x86
View file

@ -95,6 +95,11 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \
ENV PATH ${PATH}:${ANDROID_HOME}/build-tools ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
RUN sdkmanager "platforms;android-${API_LEVEL}" RUN sdkmanager "platforms;android-${API_LEVEL}"
RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}" RUN sdkmanager "system-images;android-${API_LEVEL};${IMG_TYPE};${SYS_IMG}"
RUN 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 # Download chrome driver v2.26

2
release.sh
View file

@ -163,7 +163,7 @@ function build() {
for v in "${versions[@]}"; do for v in "${versions[@]}"; do
# Find image type and default web browser # Find image type and default web browser
if [ "$v" == "5.0.1" ] || [ "$v" == "5.1.1" ]; then if [ "$v" == "5.0.1" ] || [ "$v" == "5.1.1" ]; then
IMG_TYPE=android IMG_TYPE=default
BROWSER=browser BROWSER=browser
elif [ "$v" == "6.0" ]; then elif [ "$v" == "6.0" ]; then
# It is because there is no ARM EABI v7a System Image for 6.0 # It is because there is no ARM EABI v7a System Image for 6.0