Skip to content

Commit 4022aec

Browse files
authored
Fix android NDK path (project-chip#40478)
* Fix android NDK path * Undo whitespace update
1 parent c06403f commit 4022aec

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
157 : [Silabs] Fix slc-cli retrieval
1+
158 : [Android] Fix android NDK path in vscode image

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY --from=nrf /opt/NordicSemiconductor/nRF5_tools /opt/NordicSemiconductor/nRF
3232
COPY --from=nrf /opt/NordicSemiconductor/nrfconnect /opt/NordicSemiconductor/nrfconnect
3333

3434
COPY --from=android /opt/android/sdk /opt/android/sdk
35-
COPY --from=android /opt/android/android-ndk-r23c /opt/android/android-ndk-r23c
35+
COPY --from=android /opt/android/android-ndk-r28c /opt/android/android-ndk-r28c
3636
COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
3737

3838
COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox
@@ -107,7 +107,7 @@ RUN set -x \
107107
ENV PATH=$PATH:/usr/lib/kotlinc/bin
108108
ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
109109
ENV ANDROID_HOME=/opt/android/sdk
110-
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
110+
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r28c
111111
ENV CY_TOOLS_PATHS="/opt/Tools/ModusToolbox/tools_3.2"
112112
ENV SILABS_BOARD=BRD4186C
113113
# Keep GSDK_ROOT name until rename transition to SISDK is completed

0 commit comments

Comments
 (0)