diff options
author | Adnan Begovic <adnan@cyngn.com> | 2016-03-03 10:56:39 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2016-08-25 05:27:02 -0700 |
commit | c1a8aaf0f34997a677cb9ec1223df0d70b28bd3d (patch) | |
tree | 93ed3628da8d39cf4e62e7623b11b7d885a5c648 | |
parent | 4740e55be2170712035de7e6aa9d2327e09bcb47 (diff) | |
download | android_dalvik-staging/cm-14.1-cafrebase.tar.gz android_dalvik-staging/cm-14.1-cafrebase.tar.bz2 android_dalvik-staging/cm-14.1-cafrebase.zip |
dexdeps: Ignore static initializers on analysis.staging/cm-14.1-cafrebasecm-14.0
CTS's DexDepsXmlHandler's xml parser will error
out when it finds a name attribute with a value
of "<clinit>". Modify Output class to ignore static
initializer elements to work around this.
Change-Id: I0ecbd8d0f29336cb6acba08f457bebc014c0ad5c
TICKET: CYNGNOS-2189
-rw-r--r-- | tools/dexdeps/src/com/android/dexdeps/Output.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/dexdeps/src/com/android/dexdeps/Output.java b/tools/dexdeps/src/com/android/dexdeps/Output.java index dbe3bc2da..40e2592da 100644 --- a/tools/dexdeps/src/com/android/dexdeps/Output.java +++ b/tools/dexdeps/src/com/android/dexdeps/Output.java @@ -216,9 +216,11 @@ public class Output { out.println(IN3 + "<constructor name=\"" + classNameOnly(declClassName) + "\">"); } else { - out.println(IN3 + "<method name=\"" + mref.getName() + - "\" return=\"" + descriptorToDot(mref.getReturnTypeName()) + - "\">"); + if (!mref.getName().equals("<clinit>")) { + out.println(IN3 + "<method name=\"" + mref.getName() + + "\" return=\"" + descriptorToDot(mref.getReturnTypeName()) + + "\">"); + } } String[] args = mref.getArgumentTypeNames(); for (int j = 0; j < args.length; j++) { @@ -228,7 +230,9 @@ public class Output { if (constructor) { out.println(IN3 + "</constructor>"); } else { - out.println(IN3 + "</method>"); + if (!mref.getName().equals("<clinit>")) { + out.println(IN3 + "</method>"); + } } } } |