commit e14c0d15f35793719c332398fa92587fefea2377
author Brian Carlstrom <bdc@google.com> Thu Oct 10 10:33:59 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 10 10:33:59 2013 -0700
tree ebbae28b6dd1e50325de3149c7ca6ea15bbdcd18
parent e23e5be641790320baa804113f57126073c7d670
parent d5c0001491f94321d1d4fe81e19fa6c96a9bd9de

am d5c00014: Merge "Fix dasm to set ACC_CONSTRUCTOR on <clinit>"

* commit 'd5c0001491f94321d1d4fe81e19fa6c96a9bd9de':
  Fix dasm to set ACC_CONSTRUCTOR on <clinit>

tools/dasm/src/dasm/DAsm.java

diff --git a/tools/dasm/src/dasm/DAsm.java b/tools/dasm/src/dasm/DAsm.java
index d298689..72436ac 100644
--- a/tools/dasm/src/dasm/DAsm.java
+++ b/tools/dasm/src/dasm/DAsm.java
@@ -403,8 +403,11 @@
         regs_count = 1;
 
         method_nat = new CstNat(new CstString(name), new CstString(descriptor));
-        if (method_nat.isClassInit()) access |= AccessFlags.ACC_STATIC;
-        if (method_nat.isInstanceInit()) access |= AccessFlags.ACC_CONSTRUCTOR;
+        if (method_nat.isClassInit()) {
+            access |= (AccessFlags.ACC_CONSTRUCTOR | AccessFlags.ACC_STATIC);
+        } else if (method_nat.isInstanceInit()) {
+            access |= AccessFlags.ACC_CONSTRUCTOR;
+        }
 
         method_acc = access;
     }