Add usage of InputOutputVDir into output library

- Rename several properties from jayce to library since they are related
to library.

Change-Id: Ic6ca21f60b7dd2396ffc7b08d7e2b1a2d3b46f49

3 files changed, 12 insertions, 12 deletions

diff --git a/jack/tests/com/android/jack/ImportTest.java b/jack/tests/com/android/jack/ImportTest.java
index 0d94c85..ca93858 100644
--- a/jack/tests/com/android/jack/ImportTest.java
+++ b/jack/tests/com/android/jack/ImportTest.java
@@ -39,7 +39,7 @@ public class ImportTest {
     File jackOut = TestTools.createTempDir("importtest", "dir");
     Options options =
         TestTools.buildCommandLineArgs(TestTools.getJackTestsWithJackFolder("fibonacci"));
-    options.jayceOutDir = jackOut;
+    options.libraryOutDir = jackOut;
     TestTools.runCompilation(options);
 
     Options importOptions =
@@ -53,7 +53,7 @@ public class ImportTest {
     File jackOut = TestTools.createTempDir("importtest", "dir");
     Options options =
         TestTools.buildCommandLineArgs(TestTools.getJackTestsWithJackFolder("fibonacci"));
-    options.jayceOutDir = jackOut;
+    options.libraryOutDir = jackOut;
     TestTools.runCompilation(options);
 
     Options conflictOptions =
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index 5b2ccc8..e3643bd 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -226,9 +226,9 @@ public class TestTools {
       boolean withDebugInfos) throws Exception {
     options.classpath = classpath;
     if (zip) {
-      options.jayceOutZip = out;
+      options.libraryOutZip = out;
     } else {
-      options.jayceOutDir = out;
+      options.libraryOutDir = out;
     }
     options.ecjArguments = buildEcjArgs();
     addFile(sourceFolderOrSourceList, options.ecjArguments);
@@ -258,9 +258,9 @@ public class TestTools {
     options.jayceImport.add(in);
     options.classpath = classpath;
     if (zip) {
-      options.jayceOutZip = out;
+      options.libraryOutZip = out;
     } else {
-      options.jayceOutDir = out;
+      options.libraryOutDir = out;
     }
     options.proguardFlagsFiles = new ArrayList<File>();
     for (ProguardFlags flagFile : flagFiles) {
@@ -321,9 +321,9 @@ public class TestTools {
     options.jayceImport.add(in);
     options.classpath = classpath;
     if (zip) {
-      options.jayceOutZip = out;
+      options.libraryOutZip = out;
     } else {
-      options.jayceOutDir = out;
+      options.libraryOutDir = out;
     }
     options.jarjarRulesFile = jarjarRules;
     Jack.run(options);
@@ -547,7 +547,7 @@ public class TestTools {
     Request request = Jack.createInitialRequest();
     request.addInitialTagsOrMarkers(Jack.getJavaSourceInitialTagSet());
     request.addProduction(IntermediateDexProduct.class);
-    if (ThreadConfig.get(Options.GENERATE_JAYCE_FILE).booleanValue()) {
+    if (ThreadConfig.get(Options.GENERATE_JACK_LIBRARY).booleanValue()) {
       request.addProduction(JayceFormatProduct.class);
     }
 
diff --git a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
index b868d1e..91755f0 100644
--- a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
+++ b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
@@ -79,13 +79,13 @@ public class CoreCompilationTest {
     File coreDexFromJava = new File(coreDexFolderFromJava, DexFileWriter.DEX_FILENAME);
 
     Options options = new Options();
-    options.addProperty(Options.GENERATE_JAYCE_FILE.getName(), "true");
+    options.addProperty(Options.GENERATE_JACK_LIBRARY.getName(), "true");
     File outputFile = new File("/tmp/jackIncrementalOutput");
     options.addProperty(
         Options.DEX_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString());
-    options.addProperty(Options.JAYCE_FILE_OUTPUT_DIR.getName(), outputFile.getAbsolutePath());
+    options.addProperty(Options.LIBRARY_OUTPUT_DIR.getName(), outputFile.getAbsolutePath());
     options.addProperty(
-        Options.JAYCE_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString());
+        Options.LIBRARY_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString());
     options.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString());
     TestTools.compileSourceToDex(options, SOURCELIST, null, coreDexFolderFromJava, false);