Revert "[QPG] Fix shell app (#15094)" (#15321)

ToT QPG buiulds failed with `AttributePathExpandIterator.cpp` link
errors after this commit (even though PR checks were green).

This reverts commit 2a826f9.

.github/workflows/examples-qpg.yaml

@@ -76,14 +76,6 @@ jobs:
                     qpg qpg6105+debug lighting-app \
                     out/lighting_app_debug/chip-qpg6105-lighting-example.out \
                     /tmp/bloat_reports/
-            - name: Build example QPG6105 Shell App
-              timeout-minutes: 5
-              run: |
-                  scripts/examples/gn_build_example.sh examples/shell/qpg out/shell_app_debug qpg_target_ic=\"qpg6105\"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    qpg qpg6105+debug shell-app \
-                    out/shell_app_debug/chip-qpg6105-shell-example.out \
-                    /tmp/bloat_reports/
             - name: Build example QPG6105 persistent-storage
               timeout-minutes: 5
               run: |

config/qpg/chip-gn/args.gni

@@ -36,9 +36,8 @@ chip_mdns = "platform"
 # INCLUDE_xSemaphoreGetMutexHolder
 chip_stack_lock_tracking = "none"
 
-# Using lighting-app as template config
-# Application specific override to be done as cmd line arg
-chip_project_config_include_dirs = [ "//examples/lighting-app/qpg/include" ]
+chip_project_config_include_dirs =
+    [ "//examples/platform/qpg/project_include/" ]
 chip_project_config_include = "<CHIPProjectConfig.h>"
 chip_system_project_config_include = "<CHIPProjectConfig.h>"
 chip_ble_project_config_include = ""

examples/lighting-app/qpg/BUILD.gn

@@ -34,14 +34,15 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-qpg_project_dir = "${chip_root}/examples/lighting-app/qpg"
 examples_plat_dir = "${chip_root}/examples/platform/qpg"
 
 qpg_sdk("sdk") {
+  sources = [ "${examples_plat_dir}/project_include/CHIPProjectConfig.h" ]
+
   include_dirs = [
     "${chip_root}/src/platform/qpg",
     "${examples_plat_dir}",
-    "${qpg_project_dir}/include",
+    "${examples_plat_dir}/project_include",
   ]
 
   if (chip_enable_pw_rpc) {

examples/lock-app/qpg/BUILD.gn

@@ -34,14 +34,15 @@ if (chip_enable_pw_rpc) {
 
 assert(current_os == "freertos")
 
-qpg_project_dir = "${chip_root}/examples/lock-app/qpg"
 examples_plat_dir = "${chip_root}/examples/platform/qpg"
 
 qpg_sdk("sdk") {
+  sources = [ "${examples_plat_dir}/project_include/CHIPProjectConfig.h" ]
+
   include_dirs = [
     "${chip_root}/src/platform/qpg",
     "${examples_plat_dir}",
-    "${qpg_project_dir}/include",
+    "${examples_plat_dir}/project_include",
   ]
 
   if (chip_enable_pw_rpc) {