From 11b00d5aec6e93a3c5e8c0fb24531b2cab6ddbfd Mon Sep 17 00:00:00 2001
From: Marius Vikhammer <marius.vikhammer@espressif.com>
Date: Fri, 26 Dec 2025 17:33:00 +0800
Subject: [PATCH] ci(cxx): Add depends_components attribute to build-test-rules

---
 components/cxx/CMakeLists.txt                  |  2 +-
 components/cxx/cxx_init.cpp                    |  1 -
 components/cxx/test_apps/.build-test-rules.yml |  4 ++++
 examples/cxx/.build-test-rules.yml             | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 examples/cxx/.build-test-rules.yml

diff --git a/components/cxx/CMakeLists.txt b/components/cxx/CMakeLists.txt
index 371bb2a9f1..a16ca7e941 100644
--- a/components/cxx/CMakeLists.txt
+++ b/components/cxx/CMakeLists.txt
@@ -6,7 +6,7 @@ if(${target} STREQUAL "linux")
 endif()
 
 set(srcs "cxx_exception_stubs.cpp")
-set(priv_requires esp_system)
+set(priv_requires)
 
 if(NOT esp_tee_build)
     list(APPEND srcs "cxx_guards.cpp" "cxx_init.cpp")
diff --git a/components/cxx/cxx_init.cpp b/components/cxx/cxx_init.cpp
index dcd6126971..c6d001e575 100644
--- a/components/cxx/cxx_init.cpp
+++ b/components/cxx/cxx_init.cpp
@@ -6,7 +6,6 @@
 
 #include "sdkconfig.h"
 #include "esp_log.h"
-#include "esp_private/startup_internal.h"
 
 namespace {
 const char *TAG = "C++ init";
diff --git a/components/cxx/test_apps/.build-test-rules.yml b/components/cxx/test_apps/.build-test-rules.yml
index 787715d396..b06f9d253e 100644
--- a/components/cxx/test_apps/.build-test-rules.yml
+++ b/components/cxx/test_apps/.build-test-rules.yml
@@ -5,3 +5,7 @@ components/cxx/test_apps:
     - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c61", "esp32p4"]
       temporary: true
       reason: the other targets are not tested yet
+  depends_components:
+    - cxx
+    - pthread
+    - freertos
diff --git a/examples/cxx/.build-test-rules.yml b/examples/cxx/.build-test-rules.yml
new file mode 100644
index 0000000000..b92a76f797
--- /dev/null
+++ b/examples/cxx/.build-test-rules.yml
@@ -0,0 +1,14 @@
+# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
+
+examples/cxx/exceptions:
+  depends_components:
+    - cxx
+
+examples/cxx/pthread:
+  depends_components:
+    - cxx
+    - pthread
+
+examples/cxx/rtti:
+  depends_components:
+    - cxx