From 59f792f7c0c997a4b21dac1590cd218eed928b85 Mon Sep 17 00:00:00 2001 From: Aleksandr Bochev Date: Thu, 5 Jul 2018 12:23:13 +0200 Subject: [PATCH] cleaned sdk installation --- docker/Emulator_arm | 5 ++--- docker/Emulator_x86 | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker/Emulator_arm b/docker/Emulator_arm index 992c8c5..8589d6c 100644 --- a/docker/Emulator_arm +++ b/docker/Emulator_arm @@ -83,9 +83,8 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \ IMG_TYPE=$IMG_TYPE \ BROWSER=$BROWSER 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 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 diff --git a/docker/Emulator_x86 b/docker/Emulator_x86 index 67deacb..bee9ce9 100644 --- a/docker/Emulator_x86 +++ b/docker/Emulator_x86 @@ -96,9 +96,8 @@ ENV ANDROID_VERSION=$ANDROID_VERSION \ IMG_TYPE=$IMG_TYPE \ BROWSER=$BROWSER 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 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