Work on Jack API (WIP)

Change-Id: Ib2bc0e7dcddf34e8be1374c7ac67aaf7da6d5e17

7 files changed, 29 insertions, 29 deletions

diff --git a/jack-api/src/com/android/jack/api/example/Main.java b/jack-api/src/com/android/jack/api/example/Main.java
index 3215522..be60cfa 100644
--- a/jack-api/src/com/android/jack/api/example/Main.java
+++ b/jack-api/src/com/android/jack/api/example/Main.java
@@ -19,11 +19,11 @@ package com.android.jack.api.example;
 import com.android.jack.api.ConfigNotSupportedException;
 import com.android.jack.api.JackConfig;
 import com.android.jack.api.JackConfigProvider;
-import com.android.jack.api.brest.AbortException;
-import com.android.jack.api.brest.BrestCompiler;
-import com.android.jack.api.brest.BrestConfig;
-import com.android.jack.api.brest.ConfigurationException;
-import com.android.jack.api.brest.UnrecoverableException;
+import com.android.jack.api01.AbortException;
+import com.android.jack.api01.Api01Compiler;
+import com.android.jack.api01.Api01Config;
+import com.android.jack.api01.ConfigurationException;
+import com.android.jack.api01.UnrecoverableException;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
@@ -59,12 +59,12 @@ public class Main {
     }
     System.out.println();
 
-    BrestCompiler brestCompiler;
-    BrestConfig brestConfig;
+    Api01Compiler api01Compiler;
+    Api01Config api01Config;
 
     // Get configuration object
     try {
-      brestConfig = confProvider.getConfig(BrestConfig.class);
+      api01Config = confProvider.getConfig(Api01Config.class);
     } catch (ConfigNotSupportedException e1) {
       System.err.println("Brest config not supported)");
       return;
@@ -73,14 +73,14 @@ public class Main {
     // Configure the compiler
     try {
       // Set standard options
-      brestConfig.setOutputDex(new File("out/"));
-      brestConfig.setConfigJarjar(new File("rules.jarjar"));
+      api01Config.setOutputDexFolder(new File("out/"));
+      api01Config.setConfigJarjarFile(new File("rules.jarjar"));
       // Set official properties
-      brestConfig.setProperty(BrestConfig.PROPERTY_REPORTER, "sdk");
-      // Set provisioned properties
-      brestConfig.setProperty("jack.internal.test", "true");
+      api01Config.setProperty(Api01Config.PROPERTY_REPORTER, "sdk");
+      // Set provisional properties
+      api01Config.setProperty("jack.internal.test", "true");
       // Check and build compiler
-      brestCompiler = brestConfig.build();
+      api01Compiler = api01Config.build();
     } catch (ConfigurationException e) {
       System.err.println(e.getMessage());
       return;
@@ -89,9 +89,9 @@ public class Main {
     // Run the compilation
     try {
       // First
-      brestCompiler.run();
+      api01Compiler.run();
       // Same compilation
-      brestCompiler.run();
+      api01Compiler.run();
     } catch (AbortException e) {
       System.out.println("User error, see reporter");
       return;
diff --git a/jack-api/src/com/android/jack/api/brest/AbortException.java b/jack-api/src/com/android/jack/api01/AbortException.java
index 05bd8ef..d05f953 100644
--- a/jack-api/src/com/android/jack/api/brest/AbortException.java
+++ b/jack-api/src/com/android/jack/api01/AbortException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack-api/src/com/android/jack/api/brest/BrestCompiler.java b/jack-api/src/com/android/jack/api01/Api01Compiler.java
index 111b5af..bc9925e 100644
--- a/jack-api/src/com/android/jack/api/brest/BrestCompiler.java
+++ b/jack-api/src/com/android/jack/api01/Api01Compiler.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 
 /**
  * STOPSHIP
  */
-public interface BrestCompiler {
+public interface Api01Compiler {
   void run() throws AbortException, UnrecoverableException;
 }
diff --git a/jack-api/src/com/android/jack/api/brest/BrestConfig.java b/jack-api/src/com/android/jack/api01/Api01Config.java
index e66db61..001690f 100644
--- a/jack-api/src/com/android/jack/api/brest/BrestConfig.java
+++ b/jack-api/src/com/android/jack/api01/Api01Config.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 import com.android.jack.api.JackConfig;
 
@@ -25,22 +25,22 @@ import javax.annotation.Nonnull;
 /**
  * STOPSHIP
  */
-public interface BrestConfig extends JackConfig {
+public interface Api01Config extends JackConfig {
   @Nonnull
   static final String PROPERTY_REPORTER = "jack.reporter";
 
   @Nonnull
-  BrestConfig setOutputDex(@Nonnull File file) throws ConfigurationException;
+  Api01Config setOutputDexFolder(@Nonnull File folder) throws ConfigurationException;
 
   @Nonnull
-  BrestConfig setOutputJack(@Nonnull File file) throws ConfigurationException;
+  Api01Config setOutputJackFile(@Nonnull File file) throws ConfigurationException;
 
   @Nonnull
-  BrestConfig setConfigJarjar(@Nonnull File file) throws ConfigurationException;
+  Api01Config setConfigJarjarFile(@Nonnull File file) throws ConfigurationException;
 
   @Nonnull
-  BrestConfig setProperty(@Nonnull String key, @Nonnull String value) throws ConfigurationException;
+  Api01Config setProperty(@Nonnull String key, @Nonnull String value) throws ConfigurationException;
 
   @Nonnull
-  BrestCompiler build() throws ConfigurationException;
+  Api01Compiler build() throws ConfigurationException;
 }
diff --git a/jack-api/src/com/android/jack/api/brest/ChainedException.java b/jack-api/src/com/android/jack/api01/ChainedException.java
index 7a8a01c..eea957e 100644
--- a/jack-api/src/com/android/jack/api/brest/ChainedException.java
+++ b/jack-api/src/com/android/jack/api01/ChainedException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/jack-api/src/com/android/jack/api/brest/ConfigurationException.java b/jack-api/src/com/android/jack/api01/ConfigurationException.java
index ab98c67..bf96f00 100644
--- a/jack-api/src/com/android/jack/api/brest/ConfigurationException.java
+++ b/jack-api/src/com/android/jack/api01/ConfigurationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 import javax.annotation.Nonnull;
 
diff --git a/jack-api/src/com/android/jack/api/brest/UnrecoverableException.java b/jack-api/src/com/android/jack/api01/UnrecoverableException.java
index 5d938fa..f2a9687 100644
--- a/jack-api/src/com/android/jack/api/brest/UnrecoverableException.java
+++ b/jack-api/src/com/android/jack/api01/UnrecoverableException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.api.brest;
+package com.android.jack.api01;
 
 import javax.annotation.Nonnull;