Remove 'main' directory from src/keepanno Change-Id: I964cec8d5bc6ff4b0a8cef62296c3a126c04be44

diff --git a/build.gradle b/build.gradle
index 8dbce66..f775822 100644
--- a/build.gradle
+++ b/build.gradle

@@ -200,7 +200,7 @@
     }
     keepanno {
         java {
-            srcDirs = ['src/keepanno/main/java']
+            srcDirs = ['src/keepanno/java']
         }
     }
 }

diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepCondition.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepCondition.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepCondition.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepCondition.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepConstants.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepConstants.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepConstants.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepConstants.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepEdge.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepEdge.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepEdge.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepEdge.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepTarget.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepTarget.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/annotations/KeepTarget.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/annotations/KeepTarget.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeReader.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeReader.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeReader.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeReader.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeWriter.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeWriter.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeWriter.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/asm/KeepEdgeWriter.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepCondition.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepCondition.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepCondition.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepCondition.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepConsequences.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepConsequences.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepConsequences.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepConsequences.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdge.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdge.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdge.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdge.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdgeException.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdgeException.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdgeException.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepEdgeException.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepExtendsPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepExtendsPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepExtendsPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepExtendsPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepFieldPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepFieldPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepFieldPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepFieldPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepItemPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepItemPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepItemPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepItemPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMemberPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMemberPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMemberPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMemberPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMembersPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMembersPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMembersPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMembersPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodAccessPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodAccessPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodAccessPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodAccessPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodNamePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodNamePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodNamePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodNamePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodParametersPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodParametersPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodParametersPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodParametersPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodPattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodPattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodPattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodPattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodReturnTypePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodReturnTypePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodReturnTypePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepMethodReturnTypePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepOptions.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepOptions.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepOptions.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepOptions.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepPackagePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepPackagePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepPackagePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepPackagePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepPreconditions.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepPreconditions.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepPreconditions.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepPreconditions.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepQualifiedClassNamePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepQualifiedClassNamePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepQualifiedClassNamePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepQualifiedClassNamePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepTarget.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepTarget.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepTarget.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepTarget.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepTypePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepTypePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepTypePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepTypePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepUnqualfiedClassNamePattern.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepUnqualfiedClassNamePattern.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/ast/KeepUnqualfiedClassNamePattern.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/ast/KeepUnqualfiedClassNamePattern.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/keeprules/KeepRuleExtractor.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/keeprules/KeepRuleExtractor.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/keeprules/KeepRuleExtractor.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/keeprules/KeepRuleExtractor.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/processor/KeepEdgeProcessor.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/processor/KeepEdgeProcessor.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/processor/KeepEdgeProcessor.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/processor/KeepEdgeProcessor.java


diff --git a/src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/utils/Unimplemented.java b/src/keepanno/java/com/android/tools/r8/experimental/keepanno/utils/Unimplemented.java
similarity index 100%
rename from src/keepanno/main/java/com/android/tools/r8/experimental/keepanno/utils/Unimplemented.java
rename to src/keepanno/java/com/android/tools/r8/experimental/keepanno/utils/Unimplemented.java