Fix PreProcessor names and configuration

Change-Id: I4cd34c2b72a3accd41e01a4bd906004a44306f6f

46 files changed, 135 insertions, 132 deletions

diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java
index c306c28..877943d 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java
+++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java
@@ -16,9 +16,9 @@
 
 package com.android.jack.annotationadder.test001.jack.app1;
 
-import com.android.jack.annotationadder.test001.jack.Activity;
-import com.android.jack.annotationadder.test001.jack.Application;
-import com.android.jack.annotationadder.test001.jack.Context;
+import com.android.jack.preprocessor.test001.jack.Activity;
+import com.android.jack.preprocessor.test001.jack.Application;
+import com.android.jack.preprocessor.test001.jack.Context;
 
 public class ApplicationActivity1 extends Application implements Activity {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java
index bf65e0b..2d4479d 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java
+++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.annotationadder.test001.jack.app1;
 
-import com.android.jack.annotationadder.test001.jack.Context;
+import com.android.jack.preprocessor.test001.jack.Context;
 
 public class NoAnnotation {
   public NoAnnotation() {
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java
index ea62d15..305abf3 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java
+++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.annotationadder.test001.jack.app1;
 
-import com.android.jack.annotationadder.test001.jack.Context;
+import com.android.jack.preprocessor.test001.jack.Context;
 
 public interface NoAnnotationInterface {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp
deleted file mode 100644
index 249148e..0000000
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp
+++ /dev/null
@@ -1,36 +0,0 @@
-test001:
-  @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller
-  class *
-    modifiers {
-      public | private
-    }
-    extends {
-        class com.android.jack.annotationadder.test001.jack.Instrumentation
-      | class com.android.jack.annotationadder.test001.jack.Activity
-      | class com.android.jack.annotationadder.test001.jack.Service
-      | class com.android.jack.annotationadder.test001.jack.ContentProvider
-      | class com.android.jack.annotationadder.test001.jack.BroadcastReceiver
-      | class com.android.jack.annotationadder.test001.jack.BackupAgent
-      | class com.android.jack.annotationadder.test001.jack.Application
-    }
-    annotate {
-      @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller
-      method * <init>();
-    }
-
-test002:
-  class *
-    modifiers {
-      public
-    }
-    extends {
-      class com.android.jack.annotationadder.test001.jack.Application
-    }
-    annotate {
-      @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller
-      method void attachBaseContext(class com.android.jack.annotationadder.test001.jack.Context)
-          modifiers {
-              public
-          }
-      ;
-    }
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java
index 9094de6..bc176ff 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder.test001.jack;
+package com.android.jack.preprocessor.test001.jack;
 
 public interface Activity {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java
index 475d8db..de696f5 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder.test001.jack;
+package com.android.jack.preprocessor.test001.jack;
 
 public class Application {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java
index 2b930da..2a3ec17 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder.test001.jack;
+package com.android.jack.preprocessor.test001.jack;
 
 public class Context {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java
index edcf7cd..793e6fe 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder.test001.jack;
+package com.android.jack.preprocessor.test001.jack;
 
 public class Instrumentation {
 
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java
index 75f9c7e..eb06937 100644
--- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder.test001.jack;
+package com.android.jack.preprocessor.test001.jack;
 
 public @interface MultiDexInstaller {
 
diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp
new file mode 100644
index 0000000..1f4f13b
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp
@@ -0,0 +1,36 @@
+test001:
+  @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller
+  class *
+    modifiers {
+      public | private
+    }
+    extends {
+        class com.android.jack.preprocessor.test001.jack.Instrumentation
+      | class com.android.jack.preprocessor.test001.jack.Activity
+      | class com.android.jack.preprocessor.test001.jack.Service
+      | class com.android.jack.preprocessor.test001.jack.ContentProvider
+      | class com.android.jack.preprocessor.test001.jack.BroadcastReceiver
+      | class com.android.jack.preprocessor.test001.jack.BackupAgent
+      | class com.android.jack.preprocessor.test001.jack.Application
+    }
+    annotate {
+      @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller
+      method * <init>();
+    }
+
+test002:
+  class *
+    modifiers {
+      public
+    }
+    extends {
+      class com.android.jack.preprocessor.test001.jack.Application
+    }
+    annotate {
+      @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller
+      method void attachBaseContext(class com.android.jack.preprocessor.test001.jack.Context)
+          modifiers {
+              public
+          }
+      ;
+    }
diff --git a/jack/.checkstyle b/jack/.checkstyle
index bffbd78..b5cba0c 100644
--- a/jack/.checkstyle
+++ b/jack/.checkstyle
@@ -8,7 +8,9 @@
     <file-match-pattern match-pattern="^src.*\.java$" include-pattern="true"/>
     <file-match-pattern match-pattern="^src/com/android/jack/shrob/proguard/ProguardLexer\.java$" include-pattern="false"/>
     <file-match-pattern match-pattern="^src/com/android/jack/shrob/proguard/ProguardParser\.java$" include-pattern="false"/>
-    <file-match-pattern match-pattern="^src/com/android/jack/annotationadder/AnnotationAdderLexer\.java$" include-pattern="false"/>
-    <file-match-pattern match-pattern="^src/com/android/jack/annotationadder/AnnotationAdderParser\.java$" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/com/android/jack/preprocessor/PreProcessorLexer\.java$" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/com/android/jack/preprocessor/PreProcessorParser\.java$" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/com/android/jack/preprocessor/PreProcessor_PreProcessorL\.java$" include-pattern="false"/>
+    <file-match-pattern match-pattern="^src/com/android/jack/preprocessor/PreProcessor_PreProcessorL_Java\.java$" include-pattern="false"/>
   </fileset>
 </fileset-config>
diff --git a/jack/.externalToolBuilders/Antlr Builder AnnotationAdder.launch b/jack/.externalToolBuilders/Antlr Builder PreProcessor.launch
index a4cfdd1..77a8b29 100644
--- a/jack/.externalToolBuilders/Antlr Builder AnnotationAdder.launch
+++ b/jack/.externalToolBuilders/Antlr Builder PreProcessor.launch
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
 <booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/annotationadder/AnnotationAdder.tokens&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/annotationadder/AnnotationAdderLexer.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/annotationadder/AnnotationAdderParser.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/Java.tokens&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessor.tokens&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessorL.tokens&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessorLexer.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessorParser.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessor_PreProcessorL.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/PreProcessor_PreProcessorL_Java.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/annotationadder/AnnotationAdder.g&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Jack/src/com/android/jack/preprocessor/AnnotationAdder.g&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${ee_home:JavaSE-1.6}/bin/java"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar tools/antlr.jar -fo src/com/android/jack/annotationadder src/com/android/jack/annotationadder/AnnotationAdder.g"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-jar tools/antlr.jar -fo src/com/android/jack/preprocessor src/com/android/jack/preprocessor/PreProcessor.g"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc:/Jack}"/>
 </launchConfiguration>
diff --git a/jack/.project b/jack/.project
index 40d8c95..64c7fb2 100644
--- a/jack/.project
+++ b/jack/.project
@@ -16,8 +16,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>auto,full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Antlr Builder Proguard.launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
@@ -26,20 +31,15 @@
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Antlr Builder Proguard.launch</value>
+					<value>&lt;project&gt;/.externalToolBuilders/Antlr Builder PreProcessor.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
-    <buildCommand>
-      <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-      <triggers>auto,full,incremental,</triggers>
-      <arguments>
-        <dictionary>
-          <key>LaunchConfigHandle</key>
-          <value>&lt;project&gt;/.externalToolBuilders/Antlr Builder AnnotationAdder.launch</value>
-        </dictionary>
-      </arguments>
-    </buildCommand>
+		<buildCommand>
+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/jack/.settings/findbugs-exclude.xml b/jack/.settings/findbugs-exclude.xml
index a95a7e1..4d76ab7 100644
--- a/jack/.settings/findbugs-exclude.xml
+++ b/jack/.settings/findbugs-exclude.xml
@@ -7,15 +7,15 @@
     <Class name="~com\.android\.jack\.shrob\.proguard\.ProguardParser.*"/>
 </Match>
 <Match>
-    <Class name="~com\.android\.jack\.annotationadder\.AnnotationAdderLexer.*"/>
+    <Class name="~com\.android\.jack\.preprocessor\.PreProcessorLexer.*"/>
 </Match>
 <Match>
-    <Class name="~com\.android\.jack\.annotationadder\.AnnotationAdderParser.*"/>
+    <Class name="~com\.android\.jack\.preprocessor\.PreProcessorParser.*"/>
 </Match>
 <Match>
-    <Class name="~com\.android\.jack\.annotationadder\.AnnotationAdder_AnnotationAdderL.*"/>
+    <Class name="~com\.android\.jack\.preprocessor\.PreProcessor_PreProcessorL.*"/>
 </Match>
 <Match>
-    <Class name="~com\.android\.jack\.annotationadder\.AnnotationAdder_AnnotationAdderL_Java.*"/>
+    <Class name="~com\.android\.jack\.preprocessor\.PreProcessor_PreProcessorL_Java.*"/>
 </Match>
 </FindBugsFilter>
\ No newline at end of file
diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index ce559df..8eda884 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -26,8 +26,6 @@ import com.android.jack.analysis.defsuses.UseDefsChecker;
 import com.android.jack.analysis.dfa.reachingdefs.ReachingDefinitions;
 import com.android.jack.analysis.dfa.reachingdefs.ReachingDefinitionsRemover;
 import com.android.jack.analysis.tracer.ExtendingOrImplementingClassFinder;
-import com.android.jack.annotationadder.AnnotationAdderFile;
-import com.android.jack.annotationadder.ApplyAnnotationAdder;
 import com.android.jack.backend.ResourceWriter;
 import com.android.jack.backend.dex.ClassAnnotationBuilder;
 import com.android.jack.backend.dex.ClassDefItemBuilder;
@@ -91,6 +89,8 @@ import com.android.jack.optimizations.IfWithConstantSimplifier;
 import com.android.jack.optimizations.NotSimplifier;
 import com.android.jack.optimizations.UnusedDefinitionRemover;
 import com.android.jack.optimizations.UseDefsChainsSimplifier;
+import com.android.jack.preprocessor.PreProcessorFile;
+import com.android.jack.preprocessor.PreProcessorApplier;
 import com.android.jack.scheduling.adapter.JDcoiExcludeJackFileAdapter;
 import com.android.jack.scheduling.adapter.JDefinedClassOrInterfaceAdapter;
 import com.android.jack.scheduling.adapter.JFieldAdapter;
@@ -421,8 +421,8 @@ public abstract class Jack {
         if (options.dxLegacy) {
           request.addFeature(DxLegacy.class);
         }
-        if (config.get(AnnotationAdderFile.HAS_FILE).booleanValue()) {
-          request.addFeature(AnnotationAdderFile.class);
+        if (config.get(PreProcessorFile.HAS_FILE).booleanValue()) {
+          request.addFeature(PreProcessorFile.class);
         }
         if (options.flags != null) {
           if (options.flags.shrink()) {
@@ -511,8 +511,8 @@ public abstract class Jack {
           throw new AssertionError(e);
         }
 
-        if (config.get(AnnotationAdderFile.HAS_FILE).booleanValue()) {
-          planBuilder.append(ApplyAnnotationAdder.class);
+        if (config.get(PreProcessorFile.HAS_FILE).booleanValue()) {
+          planBuilder.append(PreProcessorApplier.class);
         }
 
         if (targetProduction.contains(JackFormatProduct.class)
diff --git a/jack/src/com/android/jack/annotationadder/AddAnnotationExpression.java b/jack/src/com/android/jack/preprocessor/AddAnnotationExpression.java
index baa23c9..65f252b 100644
--- a/jack/src/com/android/jack/annotationadder/AddAnnotationExpression.java
+++ b/jack/src/com/android/jack/preprocessor/AddAnnotationExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.Annotable;
 import com.android.jack.ir.ast.JDefinedAnnotation;
diff --git a/jack/src/com/android/jack/annotationadder/AddAnnotationStep.java b/jack/src/com/android/jack/preprocessor/AddAnnotationStep.java
index 3d6490a..e037740 100644
--- a/jack/src/com/android/jack/annotationadder/AddAnnotationStep.java
+++ b/jack/src/com/android/jack/preprocessor/AddAnnotationStep.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.Annotable;
 import com.android.jack.ir.ast.JAnnotationLiteral;
diff --git a/jack/src/com/android/jack/annotationadder/AnyTypeFilter.java b/jack/src/com/android/jack/preprocessor/AnyTypeFilter.java
index a8be835..6f897b1 100644
--- a/jack/src/com/android/jack/annotationadder/AnyTypeFilter.java
+++ b/jack/src/com/android/jack/preprocessor/AnyTypeFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JType;
 
diff --git a/jack/src/com/android/jack/annotationadder/ArrayFilter.java b/jack/src/com/android/jack/preprocessor/ArrayFilter.java
index 3d5ae33..1bb6505 100644
--- a/jack/src/com/android/jack/annotationadder/ArrayFilter.java
+++ b/jack/src/com/android/jack/preprocessor/ArrayFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JArrayType;
 import com.android.jack.ir.ast.JType;
diff --git a/jack/src/com/android/jack/annotationadder/BooleanBinaryExpression.java b/jack/src/com/android/jack/preprocessor/BooleanBinaryExpression.java
index c30b437..08fb248 100644
--- a/jack/src/com/android/jack/annotationadder/BooleanBinaryExpression.java
+++ b/jack/src/com/android/jack/preprocessor/BooleanBinaryExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack/src/com/android/jack/annotationadder/BooleanBinaryOperator.java b/jack/src/com/android/jack/preprocessor/BooleanBinaryOperator.java
index 2545d0f..4d28bf7 100644
--- a/jack/src/com/android/jack/annotationadder/BooleanBinaryOperator.java
+++ b/jack/src/com/android/jack/preprocessor/BooleanBinaryOperator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 /**
  * Boolean binary operators.
diff --git a/jack/src/com/android/jack/annotationadder/BooleanExpression.java b/jack/src/com/android/jack/preprocessor/BooleanExpression.java
index e7b14be..9e999d5 100644
--- a/jack/src/com/android/jack/annotationadder/BooleanExpression.java
+++ b/jack/src/com/android/jack/preprocessor/BooleanExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack/src/com/android/jack/annotationadder/BooleanNotExpression.java b/jack/src/com/android/jack/preprocessor/BooleanNotExpression.java
index 559913b..069cee4 100644
--- a/jack/src/com/android/jack/annotationadder/BooleanNotExpression.java
+++ b/jack/src/com/android/jack/preprocessor/BooleanNotExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack/src/com/android/jack/annotationadder/ClassFilter.java b/jack/src/com/android/jack/preprocessor/ClassFilter.java
index de3a477..cd5fdad 100644
--- a/jack/src/com/android/jack/annotationadder/ClassFilter.java
+++ b/jack/src/com/android/jack/preprocessor/ClassFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.HasModifier;
 import com.android.jack.ir.ast.JClassOrInterface;
diff --git a/jack/src/com/android/jack/annotationadder/ClassMembersScope.java b/jack/src/com/android/jack/preprocessor/ClassMembersScope.java
index 9712484..96863a1 100644
--- a/jack/src/com/android/jack/annotationadder/ClassMembersScope.java
+++ b/jack/src/com/android/jack/preprocessor/ClassMembersScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JClassOrInterface;
 import com.android.jack.ir.ast.JDefinedClassOrInterface;
diff --git a/jack/src/com/android/jack/annotationadder/Context.java b/jack/src/com/android/jack/preprocessor/Context.java
index a34ec8c..cb3f581 100644
--- a/jack/src/com/android/jack/annotationadder/Context.java
+++ b/jack/src/com/android/jack/preprocessor/Context.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JNode;
 import com.android.jack.transformations.request.TransformationRequest;
diff --git a/jack/src/com/android/jack/annotationadder/Expression.java b/jack/src/com/android/jack/preprocessor/Expression.java
index 89d7584..0d7358a 100644
--- a/jack/src/com/android/jack/annotationadder/Expression.java
+++ b/jack/src/com/android/jack/preprocessor/Expression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack/src/com/android/jack/annotationadder/ExtendsScope.java b/jack/src/com/android/jack/preprocessor/ExtendsScope.java
index 6f6a4ec..0309a41 100644
--- a/jack/src/com/android/jack/annotationadder/ExtendsScope.java
+++ b/jack/src/com/android/jack/preprocessor/ExtendsScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.Jack;
 import com.android.jack.ir.ast.JClassOrInterface;
diff --git a/jack/src/com/android/jack/annotationadder/FieldFilter.java b/jack/src/com/android/jack/preprocessor/FieldFilter.java
index 7335bc9..6821bee 100644
--- a/jack/src/com/android/jack/annotationadder/FieldFilter.java
+++ b/jack/src/com/android/jack/preprocessor/FieldFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.HasModifier;
 import com.android.jack.ir.ast.JField;
diff --git a/jack/src/com/android/jack/annotationadder/IsNotEmpty.java b/jack/src/com/android/jack/preprocessor/IsNotEmpty.java
index cc7f4f0..bfdd016 100644
--- a/jack/src/com/android/jack/annotationadder/IsNotEmpty.java
+++ b/jack/src/com/android/jack/preprocessor/IsNotEmpty.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import java.util.Collection;
 
diff --git a/jack/src/com/android/jack/annotationadder/Java.g b/jack/src/com/android/jack/preprocessor/Java.g
index 0c10596..0c10596 100644
--- a/jack/src/com/android/jack/annotationadder/Java.g
+++ b/jack/src/com/android/jack/preprocessor/Java.g
diff --git a/jack/src/com/android/jack/annotationadder/MethodFilter.java b/jack/src/com/android/jack/preprocessor/MethodFilter.java
index 791521a..1cfa568 100644
--- a/jack/src/com/android/jack/annotationadder/MethodFilter.java
+++ b/jack/src/com/android/jack/preprocessor/MethodFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.HasModifier;
 import com.android.jack.ir.ast.JMethod;
diff --git a/jack/src/com/android/jack/annotationadder/ModifierPrimaryExpression.java b/jack/src/com/android/jack/preprocessor/ModifierPrimaryExpression.java
index db3e7a0..2dd8770 100644
--- a/jack/src/com/android/jack/annotationadder/ModifierPrimaryExpression.java
+++ b/jack/src/com/android/jack/preprocessor/ModifierPrimaryExpression.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.HasModifier;
 
diff --git a/jack/src/com/android/jack/annotationadder/NamePattern.java b/jack/src/com/android/jack/preprocessor/NamePattern.java
index f3970e0..6e8b31c 100644
--- a/jack/src/com/android/jack/annotationadder/NamePattern.java
+++ b/jack/src/com/android/jack/preprocessor/NamePattern.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import java.util.regex.Pattern;
 
diff --git a/jack/src/com/android/jack/annotationadder/AnnotationAdder.g b/jack/src/com/android/jack/preprocessor/PreProcessor.g
index 68e81de..eb4c2b2 100644
--- a/jack/src/com/android/jack/annotationadder/AnnotationAdder.g
+++ b/jack/src/com/android/jack/preprocessor/PreProcessor.g
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-grammar AnnotationAdder;
-import AnnotationAdderL;
+grammar PreProcessor;
+import PreProcessorL;
 
 @header {
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.HasModifier;
 import com.android.jack.ir.ast.JDefinedAnnotation;
@@ -32,7 +32,7 @@ import java.util.Collection;
 }
 
 @lexer::header {
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 }
 
 @members {
diff --git a/jack/src/com/android/jack/annotationadder/ApplyAnnotationAdder.java b/jack/src/com/android/jack/preprocessor/PreProcessorApplier.java
index 961028b..ddb3470 100644
--- a/jack/src/com/android/jack/annotationadder/ApplyAnnotationAdder.java
+++ b/jack/src/com/android/jack/preprocessor/PreProcessorApplier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.transformations.request.TransformationRequest;
@@ -38,21 +38,21 @@ import java.util.logging.Level;
 import javax.annotation.Nonnull;
 
 /**
- * This {@link RunnableSchedulable} apply the rules defined in annotation adder file.
+ * This {@link RunnableSchedulable} applies the rules defined in the PreProcessor file.
  */
-@Description("Apply the rules defined in annotation adder file.")
-@Support(AnnotationAdderFile.class)
-public class ApplyAnnotationAdder implements RunnableSchedulable<JSession> {
+@Description("Apply the rules defined in the PreProcessor file.")
+@Support(PreProcessorFile.class)
+public class PreProcessorApplier implements RunnableSchedulable<JSession> {
 
   @Override
   public void run(@Nonnull JSession session) throws Exception {
-    InputStreamFile input = ThreadConfig.get(AnnotationAdderFile.FILE);
+    InputStreamFile input = ThreadConfig.get(PreProcessorFile.FILE);
     InputStream inputStream = input.getInputStream();
     ANTLRInputStream in = new ANTLRInputStream(inputStream);
     try {
-    AnnotationAdderLexer lexer = new AnnotationAdderLexer(in);
+    PreProcessorLexer lexer = new PreProcessorLexer(in);
     CommonTokenStream tokens = new CommonTokenStream(lexer);
-    AnnotationAdderParser parser = new AnnotationAdderParser(tokens);
+    PreProcessorParser parser = new PreProcessorParser(tokens);
     Collection<Rule> rules = parser.rules(session);
     Scope scope = new TypeToEmitScope(session);
     List<TransformationRequest> requests = new ArrayList<TransformationRequest>(rules.size());
diff --git a/jack/src/com/android/jack/annotationadder/AnnotationAdderFile.java b/jack/src/com/android/jack/preprocessor/PreProcessorFile.java
index 4d48144..aaaebdd 100644
--- a/jack/src/com/android/jack/annotationadder/AnnotationAdderFile.java
+++ b/jack/src/com/android/jack/preprocessor/PreProcessorFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.sched.item.Description;
 import com.android.sched.item.Feature;
@@ -31,7 +31,7 @@ import javax.annotation.Nonnull;
  */
 @Description("Applies rule of annotation adder file")
 @HasKeyId
-public class AnnotationAdderFile implements Feature {
+public class PreProcessorFile implements Feature {
 
   @Nonnull
   public static final BooleanPropertyId HAS_FILE = BooleanPropertyId.create(
diff --git a/jack/src/com/android/jack/annotationadder/AnnotationAdderL.g b/jack/src/com/android/jack/preprocessor/PreProcessorL.g
index 21423b6..1f81b9b 100644
--- a/jack/src/com/android/jack/annotationadder/AnnotationAdderL.g
+++ b/jack/src/com/android/jack/preprocessor/PreProcessorL.g
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-lexer grammar AnnotationAdderL;
+lexer grammar PreProcessorL;
 import Java;
 
 STAR : '*';
@@ -61,8 +61,3 @@ NAME
     |   '>'
     )*
     ;
-
-
-
-
-    
diff --git a/jack/src/com/android/jack/annotationadder/PrimitiveTypeFilter.java b/jack/src/com/android/jack/preprocessor/PrimitiveTypeFilter.java
index e52fae1..058bd10 100644
--- a/jack/src/com/android/jack/annotationadder/PrimitiveTypeFilter.java
+++ b/jack/src/com/android/jack/preprocessor/PrimitiveTypeFilter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JPrimitiveType;
 import com.android.jack.ir.ast.JPrimitiveType.JPrimitiveTypeEnum;
diff --git a/jack/src/com/android/jack/annotationadder/Rule.java b/jack/src/com/android/jack/preprocessor/Rule.java
index d79e174..d1e6a99 100644
--- a/jack/src/com/android/jack/annotationadder/Rule.java
+++ b/jack/src/com/android/jack/preprocessor/Rule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import java.util.Collection;
 
diff --git a/jack/src/com/android/jack/annotationadder/RuleBuilder.java b/jack/src/com/android/jack/preprocessor/RuleBuilder.java
index 775128b..bf575c0 100644
--- a/jack/src/com/android/jack/annotationadder/RuleBuilder.java
+++ b/jack/src/com/android/jack/preprocessor/RuleBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.ir.ast.JDefinedAnnotation;
 import com.android.jack.ir.ast.JSession;
diff --git a/jack/src/com/android/jack/annotationadder/Scope.java b/jack/src/com/android/jack/preprocessor/Scope.java
index 3b03bc5..06caefb 100644
--- a/jack/src/com/android/jack/annotationadder/Scope.java
+++ b/jack/src/com/android/jack/preprocessor/Scope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import java.util.Set;
 
diff --git a/jack/src/com/android/jack/annotationadder/SingleTypeScope.java b/jack/src/com/android/jack/preprocessor/SingleTypeScope.java
index 1a323aa..e11a15b 100644
--- a/jack/src/com/android/jack/annotationadder/SingleTypeScope.java
+++ b/jack/src/com/android/jack/preprocessor/SingleTypeScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.Jack;
 import com.android.jack.ir.ast.JType;
diff --git a/jack/src/com/android/jack/annotationadder/SubContext.java b/jack/src/com/android/jack/preprocessor/SubContext.java
index 5776fae..4f952b1 100644
--- a/jack/src/com/android/jack/annotationadder/SubContext.java
+++ b/jack/src/com/android/jack/preprocessor/SubContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack/src/com/android/jack/annotationadder/TypeToEmitScope.java b/jack/src/com/android/jack/preprocessor/TypeToEmitScope.java
index 2d540d6..5dc2f1d 100644
--- a/jack/src/com/android/jack/annotationadder/TypeToEmitScope.java
+++ b/jack/src/com/android/jack/preprocessor/TypeToEmitScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.Jack;
 import com.android.jack.ir.ast.JDefinedClassOrInterface;
diff --git a/jack/tests/com/android/jack/annotationadder/AnnotationAdderTest.java b/jack/tests/com/android/jack/preprocessor/AnnotationAdderTest.java
index 3c54709..c6ce285 100644
--- a/jack/tests/com/android/jack/annotationadder/AnnotationAdderTest.java
+++ b/jack/tests/com/android/jack/preprocessor/AnnotationAdderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.annotationadder;
+package com.android.jack.preprocessor;
 
 import com.android.jack.Main;
 import com.android.jack.Options;
@@ -24,6 +24,12 @@ import com.android.jack.ir.ast.JDefinedClassOrInterface;
 import com.android.jack.ir.ast.JMethod;
 import com.android.jack.ir.ast.JSession;
 import com.android.jack.lookup.JNodeLookup;
+import com.android.jack.preprocessor.Context;
+import com.android.jack.preprocessor.PreProcessorLexer;
+import com.android.jack.preprocessor.PreProcessorParser;
+import com.android.jack.preprocessor.Rule;
+import com.android.jack.preprocessor.Scope;
+import com.android.jack.preprocessor.TypeToEmitScope;
 import com.android.sched.util.RunnableHooks;
 
 import junit.framework.Assert;
@@ -45,14 +51,14 @@ public class AnnotationAdderTest {
 
   @Test
   public void test001() throws Exception {
-    File testDir = TestTools.getJackTestsWithJackFolder("annotationadder/test001");
+    File testDir = TestTools.getJackTestsWithJackFolder("preprocessor/test001");
     Options args = TestTools.buildCommandLineArgs(testDir);
     RunnableHooks hooks = new RunnableHooks();
     JSession session = TestTools.buildSession(args, hooks);
     ANTLRFileStream in = new ANTLRFileStream(new File(testDir, "config.jpp").getAbsolutePath());
-    AnnotationAdderLexer lexer = new AnnotationAdderLexer(in);
+    PreProcessorLexer lexer = new PreProcessorLexer(in);
     CommonTokenStream tokens = new CommonTokenStream(lexer);
-    AnnotationAdderParser parser = new AnnotationAdderParser(tokens);
+    PreProcessorParser parser = new PreProcessorParser(tokens);
     Collection<Rule> rules = parser.rules(session);
     Scope scope = new TypeToEmitScope(session);
     for (Rule rule : rules) {
@@ -64,11 +70,11 @@ public class AnnotationAdderTest {
 
     JAnnotation installerAnnotation =
         session.getPhantomLookup().getAnnotation(
-            "Lcom/android/jack/annotationadder/test001/jack/MultiDexInstaller;");
+            "Lcom/android/jack/preprocessor/test001/jack/MultiDexInstaller;");
     JNodeLookup lookup = session.getLookup();
     {
       JDefinedClassOrInterface coi = lookup.getClass(
-          "Lcom/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1;");
+          "Lcom/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1;");
       Assert.assertNotNull(coi.getAnnotation(installerAnnotation));
       for (JMethod method : coi.getMethods()) {
         if (method.getName().equals("noAnnotation")) {
@@ -80,7 +86,7 @@ public class AnnotationAdderTest {
     }
     {
       JDefinedClassOrInterface coi = lookup.getClass(
-          "Lcom/android/jack/annotationadder/test001/jack/app1/NoAnnotation;");
+          "Lcom/android/jack/preprocessor/test001/jack/app1/NoAnnotation;");
       Assert.assertNull(coi.getAnnotation(installerAnnotation));
       for (JMethod method : coi.getMethods()) {
         Assert.assertNull(method.getAnnotation(installerAnnotation));
@@ -92,7 +98,7 @@ public class AnnotationAdderTest {
 
   @Test
   public void test001_002() throws Exception {
-    File testDir = TestTools.getJackTestsWithJackFolder("annotationadder/test001");
+    File testDir = TestTools.getJackTestsWithJackFolder("preprocessor/test001");
     Options options = TestTools.buildCommandLineArgs(testDir);
     options.addProperty("jack.annotation.adder.hasfile", "true");
     options.addProperty("jack.annotation.adder.file",
@@ -103,8 +109,8 @@ public class AnnotationAdderTest {
 
   @Test
   public void test001_001() throws Exception {
-    File testDir = TestTools.getJackTestsWithJackFolder("annotationadder/test001");
-    File tempDir = TestTools.createTempDir("annotation", "test");
+    File testDir = TestTools.getJackTestsWithJackFolder("preprocessor/test001");
+    File tempDir = TestTools.createTempDir("preprocessor", "test");
     TestTools.compileSourceToJack(new Options(), testDir,
         TestTools.getDefaultBootclasspathString(), tempDir, false);
 
@@ -114,9 +120,9 @@ public class AnnotationAdderTest {
     RunnableHooks hooks = new RunnableHooks();
     JSession session = TestTools.buildSession(args, hooks);
     ANTLRFileStream in = new ANTLRFileStream(new File(testDir, "config.jpp").getAbsolutePath());
-    AnnotationAdderLexer lexer = new AnnotationAdderLexer(in);
+    PreProcessorLexer lexer = new PreProcessorLexer(in);
     CommonTokenStream tokens = new CommonTokenStream(lexer);
-    AnnotationAdderParser parser = new AnnotationAdderParser(tokens);
+    PreProcessorParser parser = new PreProcessorParser(tokens);
     Collection<Rule> rules = parser.rules(session);
     Scope scope = new TypeToEmitScope(session);
     for (Rule rule : rules) {
@@ -127,11 +133,11 @@ public class AnnotationAdderTest {
     }
 
     JAnnotation installerAnnotation =
-        session.getPhantomLookup().getAnnotation("Lcom/android/jack/annotationadder/test001/jack/MultiDexInstaller;");
+        session.getPhantomLookup().getAnnotation("Lcom/android/jack/preprocessor/test001/jack/MultiDexInstaller;");
     JNodeLookup lookup = session.getLookup();
     {
       JDefinedClassOrInterface coi = lookup.getClass(
-          "Lcom/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1;");
+          "Lcom/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1;");
       Assert.assertNotNull(coi.getAnnotation(installerAnnotation));
       for (JMethod method : coi.getMethods()) {
         if (method.getName().equals("noAnnotation")) {