Skip to content

Split debug - publish debug info #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 10, 2025
Merged

Split debug - publish debug info #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d42d208
Split debug - publish debug info
r1viollet Jul 8, 2025
e63c648
Merge branch 'main' of github.com:DataDog/java-profiler into r1violle…
r1viollet Jul 9, 2025
b5723a7
Wire the debug info into the main JAR
r1viollet Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ddprof-lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ def createDebugExtractionTask(config, linkTask) {
description = 'Extract debug symbols from release library'
workingDir project.buildDir

// Declare outputs so Gradle knows what files this task creates
outputs.file getDebugFilePath(config)

doFirst {
def sourceFile = linkTask.get().linkedFile.get().asFile
def debugFile = getDebugFilePath(config)
Expand Down Expand Up @@ -127,7 +130,7 @@ def createDebugCopyTask(config, extractDebugTask) {
}
dependsOn extractDebugTask
from file("$buildDir/lib/main/${config.name}/${osIdentifier()}/${archIdentifier()}/debug")
into file(libraryTargetPath(config.name + '-debug'))
into file(libraryTargetPath(config.name))
include '**/*.debug'
include '**/*.dSYM/**'
}
Expand Down Expand Up @@ -252,6 +255,8 @@ tasks.register('copyExternalLibs', Copy) {
from(project.getProperty("with-libs")) {
include "**/*.so"
include "**/*.dylib"
include "**/*.debug"
include "**/*.dSYM/**"
}
into "${projectDir}/build/classes/java/main/META-INF/native-libs"
}
Expand Down Expand Up @@ -433,6 +438,7 @@ buildConfigNames().each { name ->
if (!project.hasProperty('skip-native')) {
dependsOn copyTask
}

from sourceSets.main.output.classesDirs
from files(libraryTargetBase(name)) {
include "**/*"
Expand Down Expand Up @@ -598,6 +604,8 @@ tasks.register('javadocJar', Jar) {
from javadoc.destinationDir
}



tasks.register('scanBuild', Exec) {
workingDir "${projectDir}/src/test/make"
commandLine 'scan-build'
Expand Down
2 changes: 1 addition & 1 deletion gradle/configurations.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def commonLinuxCompilerArgs = [
"-DCOUNTERS"
]

def commonLinuxLinkerArgs = ["-ldl", "-Wl,-z,defs", "--verbose", "-lpthread", "-lm", "-lrt", "-v"]
def commonLinuxLinkerArgs = ["-ldl", "-Wl,-z,defs", "--verbose", "-lpthread", "-lm", "-lrt", "-v", "-Wl,--build-id"]

def commonMacosCompilerArgs = commonLinuxCompilerArgs + ["-D_XOPEN_SOURCE", "-D_DARWIN_C_SOURCE"]

Expand Down
Loading