@@ -23,23 +23,33 @@ ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/cmdline-tools/tools:/
23
23
24
24
RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
25
25
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
26
- RUN mv /root/.android /tmp
26
+ RUN cp -r /root/.android /tmp
27
+ RUN cp -r /android/sdk /tmp
28
+ RUN chmod 777 -R /root/.android
27
29
RUN chmod 777 -R /tmp/.android
28
30
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
29
31
30
32
ENV PATH=$PATH:/rust/bin \
31
33
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
32
34
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
33
35
CC_i686_linux_android=i686-linux-android-gcc \
34
- HOME=/tmp
36
+ HOME=/tmp \
37
+ ANDROID_AVD_HOME=/tmp/.android/avd \
38
+ ANDROID_SDK_ROOT=/tmp/sdk
39
+
40
+ RUN ls -a /root/.android
41
+ RUN ls -a /root/.android/avd
42
+ RUN ls -a /root/.android/avd/i686.avd
43
+ RUN ls -a /tmp/.android
44
+ RUN ls -a /tmp/.android/avd
35
45
36
46
ADD runtest-android.rs /tmp/runtest.rs
37
47
ENTRYPOINT [ \
38
48
"bash" , \
39
49
"-c" , \
40
50
# set SHELL so android can detect a 64bits system, see
41
51
# http://stackoverflow.com/a/41789144
42
- "SHELL=/bin/dash /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
52
+ "SHELL=/bin/dash ANDROID_AVD_HOME=/tmp/.android/avd /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
43
53
rustc /tmp/runtest.rs -o /tmp/runtest && \
44
54
exec \" $@\" " , \
45
55
"--" \
0 commit comments