From e606e1e9f44853b226caab6fa13c041033a49e09 Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Mon, 27 Oct 2014 16:29:58 -0700
Subject: Improve DexFile debugging

Bug: 18105751

(cherry picked from commit 3f8d941d89f5dd8fff2d6faf705f1841d40c683e)

Change-Id: I445c7f39b728ea6f45f3cb7dd8ed96509cf6f1c5
---
 dalvik/src/main/java/dalvik/system/DexFile.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'dalvik')

diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java
index 7aeba87..86bb531 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/dalvik/src/main/java/dalvik/system/DexFile.java
@@ -80,7 +80,7 @@ public final class DexFile {
         mCookie = openDexFile(fileName, null, 0);
         mFileName = fileName;
         guard.open("close");
-        //System.out.println("DEX FILE cookie is " + mCookie);
+        //System.out.println("DEX FILE cookie is " + mCookie + " fileName=" + fileName);
     }
 
     /**
@@ -111,7 +111,7 @@ public final class DexFile {
         mCookie = openDexFile(sourceName, outputName, flags);
         mFileName = sourceName;
         guard.open("close");
-        //System.out.println("DEX FILE cookie is " + mCookie);
+        //System.out.println("DEX FILE cookie is " + mCookie + " sourceName=" + sourceName + " outputName=" + outputName);
     }
 
     /**
@@ -160,6 +160,10 @@ public final class DexFile {
         return mFileName;
     }
 
+    @Override public String toString() {
+        return getName();
+    }
+
     /**
      * Closes the DEX file.
      * <p>
-- 
cgit v1.1