From 7618e1636c74b1e9e9f0defa769f4fca57315e14 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sat, 28 Sep 2013 17:57:33 -0700 Subject: [PATCH] Make extra sure we don't output blank debug items --- .../src/main/java/org/jf/dexlib2/writer/DexWriter.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java index bdd6dbf7..6d09a5a6 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java @@ -31,10 +31,7 @@ package org.jf.dexlib2.writer; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Ordering; +import com.google.common.collect.*; import org.jf.dexlib2.AccessFlags; import org.jf.dexlib2.Opcode; import org.jf.dexlib2.ReferenceType; @@ -811,7 +808,8 @@ public abstract class DexWriter< } } - if (debugItems == null && parameterCount == 0) { + + if (parameterCount == 0 && (debugItems == null || Iterables.isEmpty(debugItems))) { return NO_OFFSET; }