From 3de466374d52d383d6faac80cb22d36eee378af4 Mon Sep 17 00:00:00 2001
From: Shen Wei Long <shenweilong@espressif.com>
Date: Mon, 31 Aug 2026 02:45:38 +0000
Subject: [PATCH] fix(ble): Check if there are illegal library files in
 controller lib path

(cherry picked from commit 40706bf28fdd2dd56e80a4321c5957f82d5ddcdc)

Co-authored-by: ShenWeilong <shenweilong@espressif.com>
---
 components/bt/controller/CMakeLists.txt             | 9 ++++++++-
 components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/bt/controller/CMakeLists.txt b/components/bt/controller/CMakeLists.txt
index a035fd7586e..d104f98c703 100644
--- a/components/bt/controller/CMakeLists.txt
+++ b/components/bt/controller/CMakeLists.txt
@@ -34,13 +34,20 @@ function(register_bt_ctrl_libs)
         set(lib_path "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/lib_${TARGET_SRC_NAME}/${TARGET_SRC_NAME}-bt-lib")
         # BLE controller library
         if(NOT CONFIG_BT_DUAL_MODE_ARCH OR CONFIG_BT_CTRL_BLE_ENABLE)
-            if(EXISTS "${lib_path}/libble_app.a")
+            if(NOT EXISTS "${lib_path}/${idf_target}")
                 if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND EXISTS "${lib_path}/libble_app_flash.a")
                     add_prebuilt_library(libble_app "${lib_path}/libble_app_flash.a" REQUIRES esp_phy bt)
                 else()
                     add_prebuilt_library(libble_app "${lib_path}/libble_app.a" REQUIRES esp_phy bt)
                 endif()
             else()
+                file(GLOB ILLEGAL_LIB_FILES "${lib_path}/*.a")
+                if(ILLEGAL_LIB_FILES)
+                    message(FATAL_ERROR
+                        "${lib_path} should not contain the library files!"
+                    )
+                endif()
+
                 if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY AND EXISTS "${lib_path}/${idf_target}/libble_app_flash.a")
                     add_prebuilt_library(libble_app "${lib_path}/${idf_target}/libble_app_flash.a" REQUIRES esp_phy bt)
                 else()
diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
index e786a298d3d..b7db86bd4d5 160000
--- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
+++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
@@ -1 +1 @@
-Subproject commit e786a298d3dca713b9cf5801864de0b9f75cdf04
+Subproject commit b7db86bd4d579055c4a47ca849575513f00a23f9