From 592e1358f3809893bb5fef919a561e513ce936c8 Mon Sep 17 00:00:00 2001
From: Shu Chen <chenshu@espressif.com>
Date: Fri, 28 Apr 2023 13:47:50 +0800
Subject: [PATCH] build: use zap tool from connectedhomeip env folder

---
 export.sh  |  2 +-
 install.sh | 31 ++++---------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/export.sh b/export.sh
index d9ae4b572..dc5766f9a 100644
--- a/export.sh
+++ b/export.sh
@@ -54,7 +54,7 @@ esp_matter_export_main() {
     export PATH=${PATH}:${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/out/host
 
     # export zap-cli path
-    export export ZAP_INSTALL_PATH=${ESP_MATTER_PATH}/.zap
+    export ZAP_INSTALL_PATH=${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/.environment/cipd/packages/zap
 }
 
 esp_matter_export_main
diff --git a/install.sh b/install.sh
index c9e6ce47e..98833084a 100755
--- a/install.sh
+++ b/install.sh
@@ -5,42 +5,19 @@ set -e
 basedir=$(dirname "$0")
 ESP_MATTER_PATH=$(cd "${basedir}"; pwd)
 MATTER_PATH=${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip
-export ESP_MATTER_PATH
+export ZAP_INSTALL_PATH=${MATTER_PATH}/.environment/cipd/packages/zap
 
 echo ""
 echo "Running Matter Setup"
 echo ""
 source ${MATTER_PATH}/scripts/bootstrap.sh
 
-echo ""
-echo "Installing zap-cli"
-echo ""
-# Run the zap_download.py and extract the path of installed binary
-# eg output before cut: "export ZAP_INSTALL_PATH=zap/zap-v2023.03.06-nightly"
-# output after cut: zap/zap-v2023.03.06-nightly
-# TODO: Remove the zap-version after https://github.com/project-chip/connectedhomeip/pull/25727 merged
-zap_path=`python3 ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip/scripts/tools/zap/zap_download.py \
-    --sdk-root ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip --zap RELEASE --zap-version v2023.03.27-nightly \
-    --extract-root .zap 2>/dev/null | cut -d= -f2`
-# Check whether the download is successful.
-if [ -z $zap_path ]; then
-    echo "Failed to install zap-cli"
-    deactivate
-    exit 1
-fi
-
-# Move files to one directory up, so that binaries will be in $ESP_MATTER_PATH/.zap/ directory and export.sh can leverage the fixed path
-if [ -d "${ESP_MATTER_PATH}/.zap" ]; then
-    rm -r ${ESP_MATTER_PATH}/.zap
-fi
-mkdir ${ESP_MATTER_PATH}/.zap
-mv $zap_path/* ${ESP_MATTER_PATH}/.zap/
-rm -r $zap_path
-chmod +x ${ESP_MATTER_PATH}/.zap/zap-cli
-
 echo ""
 echo "Building host tools"
 echo ""
+if [ -d "${MATTER_PATH}/out/host" ]; then
+    rm -r ${MATTER_PATH}/out/host
+fi
 gn --root="${MATTER_PATH}" gen ${MATTER_PATH}/out/host
 ninja -C ${MATTER_PATH}/out/host
 echo ""