From f75c9ab300729e000d6087739f4b131c99186204 Mon Sep 17 00:00:00 2001
From: Daniel Brondani <daniel.brondani@arm.com>
Date: Tue, 17 Mar 2026 14:23:01 +0100
Subject: [PATCH] [projmgr] Fix access sequences key extraction (#1447)

---
 tools/projmgr/src/ProjMgrWorker.cpp                           | 4 +++-
 .../ref/variables/variables.BuildType1+TargetType1.cprj       | 2 +-
 .../ref/variables/variables.BuildType1+TargetType2.cprj       | 2 +-
 .../ref/variables/variables.BuildType2+TargetType1.cprj       | 2 +-
 .../ref/variables/variables.BuildType2+TargetType2.cprj       | 2 +-
 .../test/data/TestLayers/variables/solutionDir.clayer.yml     | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
index 3c8d5bade..f94624b5c 100644
--- a/tools/projmgr/src/ProjMgrWorker.cpp
+++ b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -3531,7 +3531,9 @@ void ProjMgrWorker::ExpandAccessSequence(ContextItem& context, const ContextItem
     replacement = refContext.outputTypes.map.on ? refContextOutDir + "/" + refContext.outputTypes.map.filename : "";
   }
   // store sequence and its evaluated absolute path
-  context.absPathSequences[item.substr(1, item.size() - 2)] = replacement;
+  const auto start = item.find_first_of('$') + 1;
+  const auto end = item.find_last_of('$') - start;
+  context.absPathSequences[item.substr(start, end)] = replacement;
   // get relative path
   if (!replacement.empty() && !outdir.empty()) {
     replacement = RteFsUtils::RelativePath(replacement, outdir, withHeadingDot);
diff --git a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType1.cprj b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType1.cprj
index ba0c2e7ca..211a53787 100644
--- a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType1.cprj
+++ b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType1.cprj
@@ -18,7 +18,7 @@
     <output elf="variables.axf" intdir="tmp/variables/TargetType1/BuildType1" name="variables" outdir="out/variables/TargetType1/BuildType1" rtedir="../data/TestLayers/RTE" type="exe"/>
     <ldflags compiler="AC6" file="../data/TestLayers/variables/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct"/>
     <defines>App-Layer;Build1-Layer;SolutionDir-Layer;Target1-Layer</defines>
-    <includes>out/variables/TargetType1/BuildType1</includes>
+    <includes>out/variables/TargetType1/BuildType1/subfolder</includes>
   </target>
 
   <components>
diff --git a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType2.cprj b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType2.cprj
index 00cc2b1de..9d19e19e4 100644
--- a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType2.cprj
+++ b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType1+TargetType2.cprj
@@ -18,7 +18,7 @@
     <output elf="variables.axf" intdir="tmp/variables/TargetType2/BuildType1" name="variables" outdir="out/variables/TargetType2/BuildType1" rtedir="../data/TestLayers/RTE" type="exe"/>
     <ldflags compiler="AC6" file="../data/TestLayers/variables/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct"/>
     <defines>App-Layer;Build1-Layer;SolutionDir-Layer;Target2-Layer</defines>
-    <includes>out/variables/TargetType2/BuildType1</includes>
+    <includes>out/variables/TargetType2/BuildType1/subfolder</includes>
   </target>
 
   <components>
diff --git a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType1.cprj b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType1.cprj
index 8b9ac8dd4..43e40912a 100644
--- a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType1.cprj
+++ b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType1.cprj
@@ -18,7 +18,7 @@
     <output elf="variables.axf" intdir="tmp/variables/TargetType1/BuildType2" name="variables" outdir="out/variables/TargetType1/BuildType2" rtedir="../data/TestLayers/RTE" type="exe"/>
     <ldflags compiler="AC6" file="../data/TestLayers/variables/RTE/Device/RteTest_ARMCM0/ARMCM0_ac6.sct"/>
     <defines>App-Layer;Build2-Layer;SolutionDir-Layer;Target1-Layer</defines>
-    <includes>out/variables/TargetType1/BuildType2</includes>
+    <includes>out/variables/TargetType1/BuildType2/subfolder</includes>
   </target>
 
   <components>
diff --git a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType2.cprj b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType2.cprj
index 6fdbb9e12..693113a6c 100644
--- a/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType2.cprj
+++ b/tools/projmgr/test/data/TestLayers/ref/variables/variables.BuildType2+TargetType2.cprj
@@ -18,7 +18,7 @@
     <output elf="variables.axf" intdir="tmp/variables/TargetType2/BuildType2" name="variables" outdir="out/variables/TargetType2/BuildType2" rtedir="../data/TestLayers/RTE" type="exe"/>
     <ldflags compiler="AC6" file="../data/TestLayers/variables/RTE/Device/RteTest_ARMCM3/ARMCM3_ac6.sct"/>
     <defines>App-Layer;Build2-Layer;SolutionDir-Layer;Target2-Layer</defines>
-    <includes>out/variables/TargetType2/BuildType2</includes>
+    <includes>out/variables/TargetType2/BuildType2/subfolder</includes>
   </target>
 
   <components>
diff --git a/tools/projmgr/test/data/TestLayers/variables/solutionDir.clayer.yml b/tools/projmgr/test/data/TestLayers/variables/solutionDir.clayer.yml
index ac58bd7ed..9acf75674 100644
--- a/tools/projmgr/test/data/TestLayers/variables/solutionDir.clayer.yml
+++ b/tools/projmgr/test/data/TestLayers/variables/solutionDir.clayer.yml
@@ -3,7 +3,7 @@
 layer:
 
   add-path:
-    - $OutDir()$
+    - $OutDir()$/subfolder
 
   define:
     - SolutionDir-Layer