@@ -13,33 +13,45 @@ RUN apt-get install -y --no-install-recommends \
13
13
expect \
14
14
openjdk-8-jre \
15
15
libstdc++6:i386 \
16
- libpulse0
16
+ libpulse0 \
17
+ android-sdk
17
18
18
19
WORKDIR /android/
19
20
COPY android* /android/
20
21
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
22
25
ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
23
26
24
27
RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
25
28
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
27
32
RUN chmod 777 -R /tmp/.android
28
33
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
29
34
30
35
ENV PATH=$PATH:/rust/bin \
31
36
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
32
37
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
33
38
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
35
47
36
48
ADD runtest-android.rs /tmp/runtest.rs
37
49
ENTRYPOINT [ \
38
50
"bash" , \
39
51
"-c" , \
40
52
# set SHELL so android can detect a 64bits system, see
41
53
# 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 & \
43
55
rustc /tmp/runtest.rs -o /tmp/runtest && \
44
56
exec \" $@\" " , \
45
57
"--" \
0 commit comments