Skip to content

Commit 7c76477

Browse files
committed
Document lack of Android 7.1 support.
1 parent 020c152 commit 7c76477

11 files changed

+142
-106
lines changed

docker/Dockerfile.aarch64-linux-android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN /android-ndk.sh arm64
2323
ENV PATH=$PATH:/android-ndk/bin
2424

2525
# TODO(ahuszagh) Restore...
26-
COPY android-system.sh remove_soong_tests.py /
26+
COPY android-system.sh remove_android_tests.py /
2727
#RUN /android-system.sh arm64
2828
#
2929
#COPY android-symlink.sh /

docker/Dockerfile.aarch64-linux-android.bak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY android-ndk.sh /
2222
RUN /android-ndk.sh arm64
2323
ENV PATH=$PATH:/android-ndk/bin
2424

25-
COPY android-system.sh remove_soong_tests.py /
25+
COPY android-system.sh remove_android_tests.py /
2626
RUN /android-system.sh arm64
2727

2828
COPY android-symlink.sh /

docker/Dockerfile.arm-linux-androideabi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY android-ndk.sh /
2222
RUN /android-ndk.sh arm
2323
ENV PATH=$PATH:/android-ndk/bin
2424

25-
COPY android-system.sh remove_soong_tests.py /
25+
COPY android-system.sh remove_android_tests.py /
2626
RUN /android-system.sh arm
2727

2828
COPY android-symlink.sh /

docker/Dockerfile.armv7-linux-androideabi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY android-ndk.sh /
2222
RUN /android-ndk.sh arm
2323
ENV PATH=$PATH:/android-ndk/bin
2424

25-
COPY android-system.sh remove_soong_tests.py /
25+
COPY android-system.sh remove_android_tests.py /
2626
RUN /android-system.sh arm
2727

2828
COPY android-symlink.sh /

docker/Dockerfile.i686-linux-android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ COPY android-ndk.sh /
3030
RUN /android-ndk.sh x86
3131
ENV PATH=$PATH:/android-ndk/bin
3232

33-
COPY android-system.sh remove_soong_tests.py /
33+
COPY android-system.sh remove_android_tests.py /
3434
RUN /android-system.sh x86
3535

3636
COPY android-symlink.sh /

docker/Dockerfile.thumbv7neon-linux-androideabi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ COPY android-ndk.sh /
2222
RUN /android-ndk.sh arm
2323
ENV PATH=$PATH:/android-ndk/bin
2424

25-
COPY android-system.sh remove_soong_tests.py /
25+
COPY android-system.sh remove_android_tests.py /
2626
RUN /android-system.sh arm
2727

2828
COPY android-symlink.sh /

docker/Dockerfile.x86_64-linux-android

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ COPY android-ndk.sh /
2323
RUN /android-ndk.sh x86_64
2424
ENV PATH=$PATH:/android-ndk/bin
2525

26-
COPY android-system.sh remove_soong_tests.py /
26+
COPY android-system.sh remove_android_tests.py /
2727
RUN /android-system.sh x86_64
2828

2929
COPY android-symlink.sh /

docker/android-ndk.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ NDK_URL="https://dl.google.com/android/repository/${NDK_FILENAME}"
2121
main() {
2222
local arch="${1}"
2323

24+
if [[ "${ANDROID_SDK}" -eq 25 ]]; then
25+
echo "Android SDK level 25 is not supported." 1>&2
26+
exit 1
27+
fi
28+
2429
# python3 is needed for newer NDK versions
2530
install_packages curl unzip python python3
2631

0 commit comments

Comments
 (0)