Skip to content
This repository was archived by the owner on Mar 31, 2022. It is now read-only.

Commit e2b0e6e

Browse files
trapacskaghaabor
authored andcommitted
Updated compatibility, added preinstalled x86 img (#139)
* Updated compatibility, added preinstalled x86 img * Update Dockerfile * updated LD_LIBRARY_PATH ENV
1 parent d79b2b5 commit e2b0e6e

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

Dockerfile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,7 @@ ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}
4141
RUN yes | sdkmanager --licenses
4242

4343
# Platform tools
44-
RUN sdkmanager "platform-tools"
45-
46-
# Emulator
47-
# RUN sdkmanager "emulator"
48-
# For now we'll keep using 26.1.2 ; 26.1.3 had some booting issues...
49-
RUN cd /opt \
50-
&& wget https://dl.google.com/android/repository/emulator-linux-4077558.zip -O emulator.zip \
51-
&& unzip -q emulator.zip -d ${ANDROID_HOME} \
52-
&& rm emulator.zip
44+
RUN sdkmanager "emulator" "tools" "platform-tools"
5345

5446
# SDKs
5547
# Please keep these in descending order!
@@ -78,6 +70,7 @@ RUN yes | sdkmanager \
7870
"build-tools;21.1.2" \
7971
"build-tools;19.1.0" \
8072
"build-tools;17.0.0" \
73+
"system-images;android-26;google_apis;x86" \
8174
"system-images;android-25;google_apis;armeabi-v7a" \
8275
"system-images;android-24;default;armeabi-v7a" \
8376
"system-images;android-22;default;armeabi-v7a" \
@@ -150,7 +143,7 @@ RUN /usr/bin/gcloud config set --installation component_manager/disable_update_c
150143
# Required for Android ARM Emulator
151144
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libqt5widgets5
152145
ENV QT_QPA_PLATFORM offscreen
153-
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${ANDROID_HOME}/tools/lib64
146+
ENV LD_LIBRARY_PATH ${ANDROID_HOME}/tools/lib64:${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib
154147

155148

156149
# ------------------------------------------------------

0 commit comments

Comments
 (0)