Skip to content

Commit 48b6e3e

Browse files
committed
what about this
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
1 parent 22167ea commit 48b6e3e

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

ci/android-install-sdk.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ esac;
3939

4040
# Try to fix warning about missing file.
4141
# See https://askubuntu.com/a/1078784
42-
mkdir -p /root/.android/
43-
echo '### User Sources for Android SDK Manager' >> /root/.android/repositories.cfg
44-
echo '#Fri Nov 03 10:11:27 CET 2017 count=0' >> /root/.android/repositories.cfg
42+
mkdir -p /tmp/.android/avd
43+
echo '### User Sources for Android SDK Manager' >> /tmp/.android/repositories.cfg
44+
echo '#Fri Nov 03 10:11:27 CET 2017 count=0' >> /tmp/.android/repositories.cfg
4545

4646
# Print all available packages
4747
# yes | ./sdk/tools/bin/sdkmanager --list --verbose
@@ -59,6 +59,6 @@ yes | ./sdk/cmdline-tools/tools/bin/sdkmanager --no_https \
5959
"${image}" | grep -v = || true
6060

6161
echo "no" |
62-
./sdk/cmdline-tools/tools/bin/avdmanager create avd \
62+
./sdk/cmdline-tools/tools/bin/avdmanager -v create avd \
6363
--name "${1}" \
6464
--package "${image}" | grep -v = || true

ci/docker/i686-linux-android/Dockerfile

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,45 @@ RUN apt-get install -y --no-install-recommends \
1313
expect \
1414
openjdk-8-jre \
1515
libstdc++6:i386 \
16-
libpulse0
16+
libpulse0 \
17+
android-sdk
1718

1819
WORKDIR /android/
1920
COPY android* /android/
2021

21-
ENV ANDROID_ARCH=i686
22+
ENV ANDROID_ARCH=i686 \
23+
ANDROID_HOME=/usr/lib/android-sdk \
24+
ANDROID_SDK_ROOT=/usr/lib/android-sdk
2225
ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
2326

2427
RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
2528
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
26-
RUN mv /root/.android /tmp
29+
RUN cp -r /root/.android /tmp
30+
RUN cp -r /android/sdk /tmp
31+
RUN chmod 777 -R /root/.android
2732
RUN chmod 777 -R /tmp/.android
2833
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
2934

3035
ENV PATH=$PATH:/rust/bin \
3136
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
3237
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
3338
CC_i686_linux_android=i686-linux-android-gcc \
34-
HOME=/tmp
39+
HOME=/tmp \
40+
ANDROID_AVD_HOME=/tmp/.android/avd
41+
42+
RUN ls -a /root/.android
43+
RUN ls -a /root/.android/avd
44+
RUN ls -a /root/.android/avd/i686.avd
45+
RUN ls -a /tmp/.android
46+
RUN ls -a /tmp/.android/avd
3547

3648
ADD runtest-android.rs /tmp/runtest.rs
3749
ENTRYPOINT [ \
3850
"bash", \
3951
"-c", \
4052
# set SHELL so android can detect a 64bits system, see
4153
# http://stackoverflow.com/a/41789144
42-
"SHELL=/bin/dash /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
54+
"SHELL=/bin/dash ANDROID_AVD_HOME=/tmp/.android/avd /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
4355
rustc /tmp/runtest.rs -o /tmp/runtest && \
4456
exec \"$@\"", \
4557
"--" \

0 commit comments

Comments
 (0)