diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-09 12:06:00 +0200 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-21 14:37:31 +0200 |
| commit | 5d51f919ec8edf869b63e189e18f02ef22ec851d (patch) | |
| tree | 9b6cd2d61063205409d5c4807568f62a791c3d0f /jack/tests | |
| parent | ccc90358827a5fb73d1fabdeccb97d9c03fa41a3 (diff) | |
| download | toolchain_jack-5d51f919ec8edf869b63e189e18f02ef22ec851d.zip toolchain_jack-5d51f919ec8edf869b63e189e18f02ef22ec851d.tar.gz toolchain_jack-5d51f919ec8edf869b63e189e18f02ef22ec851d.tar.bz2 | |
Change references to Jack files into Jayce files in Jack.
Change-Id: I49b2e52dd08e33a4e74936c267cec851956ff54b
Diffstat (limited to 'jack/tests')
| -rw-r--r-- | jack/tests/com/android/jack/TestTools.java | 6 | ||||
| -rw-r--r-- | jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java index e6420cb..cc33f3e 100644 --- a/jack/tests/com/android/jack/TestTools.java +++ b/jack/tests/com/android/jack/TestTools.java @@ -20,7 +20,7 @@ import com.android.dx.command.dexer.Main.Arguments; import com.android.jack.Options.VerbosityLevel; import com.android.jack.backend.dex.DexFileWriter; import com.android.jack.backend.dex.IntermediateDexProduct; -import com.android.jack.backend.jayce.JackFormatProduct; +import com.android.jack.backend.jayce.JayceFormatProduct; import com.android.jack.dx.dex.file.DexFile; import com.android.jack.ir.ast.JDefinedClassOrInterface; import com.android.jack.ir.ast.JMethod; @@ -547,8 +547,8 @@ public class TestTools { Request request = Jack.createInitialRequest(); request.addInitialTagsOrMarkers(Jack.getJavaSourceInitialTagSet()); request.addProduction(IntermediateDexProduct.class); - if (ThreadConfig.get(Options.GENERATE_JACK_FILE).booleanValue()) { - request.addProduction(JackFormatProduct.class); + if (ThreadConfig.get(Options.GENERATE_JAYCE_FILE).booleanValue()) { + request.addProduction(JayceFormatProduct.class); } PlanBuilder<JSession> planBuilder = request.getPlanBuilder(JSession.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 ef5a807..9ed68c1 100644 --- a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java @@ -66,13 +66,13 @@ public class CoreCompilationTest { File coreDexFromJava = new File(coreDexFolderFromJava, DexFileWriter.DEX_FILENAME); Options options = new Options(); - options.addProperty(Options.GENERATE_JACK_FILE.getName(), "true"); + options.addProperty(Options.GENERATE_JAYCE_FILE.getName(), "true"); File outputFile = new File("/tmp/jackIncrementalOutput"); options.addProperty( Options.DEX_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString()); - options.addProperty(Options.JACK_FILE_OUTPUT_DIR.getName(), outputFile.getAbsolutePath()); + options.addProperty(Options.JAYCE_FILE_OUTPUT_DIR.getName(), outputFile.getAbsolutePath()); options.addProperty( - Options.JACK_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString()); + Options.JAYCE_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString()); TestTools.compileSourceToDex(options, SOURCELIST, null, coreDexFolderFromJava, false); File coreDexFolderFromJack = TestTools.createTempDir("coreFromJack", "dex"); |