Layout distributions can include files from the suite [GR-48384]].

No need to create custom projects and intermediate distributions.
We also do not want to upload it to Maven or to create a MANIFEST file for it.

Author: ansalond

substratevm/src/com.oracle.svm.hosted.image.debug/gdbpy/gdb-debughelpers.py renamed to substratevm/debug/gdbpy/gdb-debughelpers.py

@@ -2021,17 +2021,6 @@ def isJDKDependent(self):
         return True
 
 
-class GDBDebugHelpers(mx.ArchivableProject):
-    def output_dir(self):
-        return os.path.join(self.dir, 'src', self.name, 'gdbpy')
-
-    def archive_prefix(self):
-        return ''
-
-    def getResults(self):
-        return [os.path.join(self.output_dir(), 'gdb-debughelpers.py')]
-
-
 class SubstrateCompilerFlagsBuilder(mx.ArchivableProject):
 
     flags_build_dependencies = [

substratevm/mx.substratevm/mx_substratevm.py

@@ -735,10 +735,6 @@
             "spotbugs" : "false",
         },
 
-        "com.oracle.svm.hosted.image.debug": {
-            "class": "GDBDebugHelpers",
-        },
-
         # Native libraries below explicitly set _FORTIFY_SOURCE to 0. This constant controls how glibc handles some
         # functions that can cause a stack overflow like snprintf. If set to 1 or 2, it causes glibc to use internal
         # functions with extra checking that are not available in all libc implementations. Different distros use
@@ -2167,17 +2163,12 @@
             },
         },
 
-        "SVM_DEBUG_HELPER": {
-            "dependencies": ["com.oracle.svm.hosted.image.debug"],
-            "javaCompliance" : "21+",
-        },
-
         "SVM_GRAALVM_SUPPORT" : {
             "native" : True,
             "platformDependent" : True,
             "description" : "SubstrateVM support distribution for the GraalVM",
             "layout" : {
-                "debug/": ["extracted-dependency:substratevm:SVM_DEBUG_HELPER"],
+                "debug/": ["file:debug/gdbpy/gdb-debughelpers.py"],
                 "clibraries/" : ["extracted-dependency:substratevm:SVM_HOSTED_NATIVE"],
                 "builder/clibraries/" : ["extracted-dependency:substratevm:SVM_HOSTED_NATIVE"],
                 "builder/lib/" : ["dependency:com.oracle.svm.native.reporterchelper"],