Skip to content

Commit 9acb856

Browse files
authoredFeb 14, 2025
Fix Android cmdline-tools paths in VSCode docker (#37587)
1 parent 207cdfa commit 9acb856

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎.devcontainer/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5454
&& chmod +x /usr/local/bin/restyle-path \
5555
&& :
5656

57-
RUN mkdir -p /opt/sdk/sdks/ \
57+
RUN mkdir -p /opt/android/sdk \
5858
&& chown -R $USERNAME:$USERNAME \
59-
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
59+
/opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
6060
$ANDROID_HOME \
6161
$IDF_TOOLS_PATH \
6262
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6363
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6464
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6565
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6666
&& chmod -R +x \
67-
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
67+
$ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
6868
&& chmod -R +w \
6969
$IDF_TOOLS_PATH \
7070
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
7171
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
7272
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
7373
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
74-
# Safe directory is preffered over chown.
74+
# Safe directory is preferred over chown.
7575
&& git config --global --add safe.directory "*" \
7676
&& :
7777

0 commit comments

Comments
 (0)