Skip to content

Commit eff35f8

Browse files
upgrade android ndk with r28c (project-chip#40468)
1 parent 52b6e28 commit eff35f8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
154 : [NXP] Update NXP SDK docker to 25.06.00
1+
155 : [NXP] Update android ndk with r28c

integrations/docker/images/stage-3/chip-build-android/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ RUN set -x \
4040
# Download and install android NDK
4141
RUN set -x \
4242
&& cd /tmp \
43-
&& wget https://dl.google.com/android/repository/android-ndk-r23c-linux.zip \
43+
&& wget https://dl.google.com/android/repository/android-ndk-r28c-linux.zip \
4444
&& mkdir -p /opt/android \
4545
&& cd /opt/android \
46-
&& unzip /tmp/android-ndk-r23c-linux.zip \
47-
&& rm -f /tmp/android-ndk-r23c-linux.zip \
46+
&& unzip /tmp/android-ndk-r28c-linux.zip \
47+
&& rm -f /tmp/android-ndk-r28c-linux.zip \
4848
&& : # last line
4949

5050
# Install specific release of openssl and compile for x86/armv7-a
@@ -57,7 +57,7 @@ RUN set -x \
5757
RUN set -x \
5858
&& export OPENSSL_ARMV7=/usr/local/src/armeabi-v7a \
5959
&& export OPENSSL_X86=/usr/local/src/x86 \
60-
&& export ANDROID_NDK_HOME=/opt/android/android-ndk-r23c \
60+
&& export ANDROID_NDK_HOME=/opt/android/android-ndk-r28c \
6161
&& export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
6262
&& cd /tmp && wget https://www.openssl.org/source/openssl-1.1.1t.tar.gz \
6363
&& mkdir -p $OPENSSL_ARMV7 && cd $OPENSSL_ARMV7 && tar xfz /tmp/openssl-1.1.1t.tar.gz \
@@ -68,5 +68,5 @@ RUN set -x \
6868
&& : # last line
6969

7070
ENV ANDROID_HOME=/opt/android/sdk
71-
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
71+
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r28c
7272
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64

0 commit comments

Comments
 (0)