summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2010-02-09 13:30:57 -0800
committerAndy McFadden <fadden@android.com>2010-02-11 15:57:22 -0800
commit00da1fe5d42693f2bcf5351a459db1fb32b9ca9c (patch)
tree6afabb0df9f70d6d1d641997cd8cd24cf6500bf2
parent1357e94efecd485bda933270a9181035f6a39e09 (diff)
downloaddalvik-00da1fe5d42693f2bcf5351a459db1fb32b9ca9c.tar.gz
Minor dexdeps touchups.
Made XML output the default. Added a couple of blank lines in the "brief" output. Added version number (1.1) and a copyright one-liner.
-rw-r--r--tools/dexdeps/src/com/android/dexdeps/Main.java8
-rw-r--r--tools/dexdeps/src/com/android/dexdeps/Output.java4
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/dexdeps/src/com/android/dexdeps/Main.java b/tools/dexdeps/src/com/android/dexdeps/Main.java
index 7eba3aa80..b1f7f9613 100644
--- a/tools/dexdeps/src/com/android/dexdeps/Main.java
+++ b/tools/dexdeps/src/com/android/dexdeps/Main.java
@@ -30,7 +30,7 @@ public class Main {
private static final String CLASSES_DEX = "classes.dex";
private String mInputFileName;
- private String mOutputFormat = "brief";
+ private String mOutputFormat = "xml";
/**
* Entry point.
@@ -193,9 +193,11 @@ public class Main {
* Prints command-line usage info.
*/
void usage() {
- System.err.println("\nUsage: dexdeps [options] <file.{dex,apk,jar}>");
+ System.err.println("DEX dependency scanner v1.1");
+ System.err.println("Copyright (C) 2009 The Android Open Source Project\n");
+ System.err.println("Usage: dexdeps [options] <file.{dex,apk,jar}>");
System.err.println("Options:");
- System.err.println(" --format={brief,xml}");
+ System.err.println(" --format={xml,brief}");
}
}
diff --git a/tools/dexdeps/src/com/android/dexdeps/Output.java b/tools/dexdeps/src/com/android/dexdeps/Output.java
index 7114951dc..122544cfd 100644
--- a/tools/dexdeps/src/com/android/dexdeps/Output.java
+++ b/tools/dexdeps/src/com/android/dexdeps/Output.java
@@ -64,7 +64,7 @@ public class Output {
* Prints the list of fields in a simple human-readable format.
*/
static void printFieldRefs(ClassRef[] classes) {
- System.out.println("Fields:");
+ System.out.println("\nFields:");
for (int i = 0; i < classes.length; i++) {
FieldRef[] fields = classes[i].getFieldArray();
@@ -81,7 +81,7 @@ public class Output {
* Prints the list of methods in a simple human-readable format.
*/
static void printMethodRefs(ClassRef[] classes) {
- System.out.println("Methods:");
+ System.out.println("\nMethods:");
for (int i = 0; i < classes.length; i++) {
MethodRef[] methods = classes[i].getMethodArray();