From 6a4eb3417c3257d4202fd30c538dcb77803a9db7 Mon Sep 17 00:00:00 2001
From: ElvenWang <elven.wang@nxp.com>
Date: Wed, 5 Jan 2022 18:07:57 +0800
Subject: [PATCH] Add NXP imx Docker image support for vscode image

Signed-off-by: Haoran.Wang <elven.wang@nxp.com>
---
 .devcontainer/Dockerfile                                | 2 ++
 integrations/docker/images/chip-build-vscode/Dockerfile | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2bed35daf190ea..774da18b982ba1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -72,3 +72,5 @@ RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/
 
 # NXP uses a patch_sdk script to change SDK files
 RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/
+
+RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.10-hardknott/
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index f6b5fb16b1822f..dd2f4cb360de43 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -10,6 +10,7 @@ FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen
 FROM connectedhomeip/chip-build-crosscompile:${VERSION} AS crosscompile
 FROM connectedhomeip/chip-build-ameba:${VERSION} AS ameba
 FROM connectedhomeip/chip-build-k32w:${VERSION} AS k32w
+FROM connectedhomeip/chip-build-imx:${VERSION} AS imx
 FROM connectedhomeip/chip-build:${VERSION}
 
 # qemu-src copied over because qemu directory contains symlinks to the src
@@ -40,6 +41,9 @@ COPY --from=ameba /opt/ameba /opt/ameba
 
 COPY --from=k32w /opt/sdk/sdks /opt/sdk/sdks
 
+COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
+
+
 # Android license file "acceping" is done by writing license hashes
 # into the 'licenses' subfolder. This allows any user (in particular
 # 'vscode' to accept licenses)
@@ -67,3 +71,4 @@ ENV TIZEN_HOME /opt/tizen_sdk
 ENV SYSROOT_AARCH64=/opt/ubuntu-21.04-aarch64-sysroot
 ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
 ENV NXP_K32W061_SDK_ROOT=/opt/sdk/sdks
+ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.10-hardknott/