diff options
| author | Alex Humesky <ahumesky@google.com> | 2020-06-16 20:36:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 20:36:44 +0000 |
| commit | 7072985393da11ffca41e9aba97bf8cf81c0e50a (patch) | |
| tree | 3cde365b303ff8687e11acbe82c3b81fb489c0dc /java/java.go | |
| parent | caa7749d8269a18bebad4d83a1785d6255883b65 (diff) | |
| parent | 849ca22fe06588acc192964924b059cf12324d7f (diff) | |
Merge "Do not override "-g:source,lines" for host java binaries when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO is set." am: c7f8b74365 am: 849ca22fe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1339636
Change-Id: I482dee048952846d251168df148817e5b6c0efbd
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 77da628bc..65b13e052 100644 --- a/java/java.go +++ b/java/java.go @@ -1171,9 +1171,9 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB if flags.javaVersion.usesJavaModules() { javacFlags = append(javacFlags, j.properties.Openjdk9.Javacflags...) } - if ctx.Config().MinimizeJavaDebugInfo() { - // Override the -g flag passed globally to remove local variable debug info to reduce - // disk and memory usage. + if ctx.Config().MinimizeJavaDebugInfo() && !ctx.Host() { + // For non-host binaries, override the -g flag passed globally to remove + // local variable debug info to reduce disk and memory usage. javacFlags = append(javacFlags, "-g:source,lines") } javacFlags = append(javacFlags, "-Xlint:-dep-ann") |