commit 7af1e1070f5af831d340854a6c76127ea09ffadd
author Ivan Gavrilovic <gavra@google.com> Fri Nov 17 07:27:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 17 07:27:52 2017 +0000
tree 2c2e93f2498797eceab97e4798cf6c185c10aa9b
parent 59898630fa3ead11ecbce6a2578ffaa6447b6529
parent 74c972308ffe8564bdb75ae343b425128a6cfec3

Merge "Do not consider clinit as static interface method"

dx/src/com/android/dx/cf/code/ConcreteMethod.java

diff --git a/dx/src/com/android/dx/cf/code/ConcreteMethod.java b/dx/src/com/android/dx/cf/code/ConcreteMethod.java
index 2210c89..b544add 100644
--- a/dx/src/com/android/dx/cf/code/ConcreteMethod.java
+++ b/dx/src/com/android/dx/cf/code/ConcreteMethod.java
@@ -138,7 +138,8 @@
      * @return true if the method is being defined on an interface.
      */
     public final boolean isDefaultOrStaticInterfaceMethod() {
-        return (classFile.getAccessFlags() & AccessFlags.ACC_INTERFACE) != 0;
+        return (classFile.getAccessFlags() & AccessFlags.ACC_INTERFACE) != 0
+            && !getNat().isClassInit();
     }
 
     /**

dx/tests/143-interface-methods/StaticDefinition.java

diff --git a/dx/tests/143-interface-methods/StaticDefinition.java b/dx/tests/143-interface-methods/StaticDefinition.java
index 1a81738..ab82cfc 100644
--- a/dx/tests/143-interface-methods/StaticDefinition.java
+++ b/dx/tests/143-interface-methods/StaticDefinition.java
@@ -15,7 +15,8 @@
  */
 
 public interface StaticDefinition {
-    public static void printIt(String s) {
+  long createsClinit = System.currentTimeMillis();
+  public static void printIt(String s) {
         System.out.println(s);
     }
 }