summaryrefslogtreecommitdiffstats
path: root/jack/tests
diff options
context:
space:
mode:
authormikaelpeltier <mikaelpeltier@google.com>2014-12-16 11:47:10 +0100
committermikaelpeltier <mikaelpeltier@google.com>2014-12-17 17:21:48 +0100
commitc64c06bc935e0c3ff3060b348b31acdd3ba3d7f9 (patch)
tree8eefd144374e6e939b3abcdc527eb184fbe584c8 /jack/tests
parent09b72859dc18177a8db2c7f73f2dbd7d3327da0e (diff)
downloadtoolchain_jack-c64c06bc935e0c3ff3060b348b31acdd3ba3d7f9.tar.gz
toolchain_jack-c64c06bc935e0c3ff3060b348b31acdd3ba3d7f9.tar.bz2
toolchain_jack-c64c06bc935e0c3ff3060b348b31acdd3ba3d7f9.zip
Merge intermediate library and output jack library
Change-Id: I401801c7a14ede06747e401c30472faa4c3b1f31
Diffstat (limited to 'jack/tests')
-rw-r--r--jack/tests/com/android/jack/TestTools.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java
index 75df6110..3b627748 100644
--- a/jack/tests/com/android/jack/TestTools.java
+++ b/jack/tests/com/android/jack/TestTools.java
@@ -553,7 +553,7 @@ public class TestTools {
Request request = Jack.createInitialRequest();
request.addInitialTagsOrMarkers(Jack.getJavaSourceInitialTagSet());
request.addProduction(DexInLibraryProduct.class);
- if (ThreadConfig.get(Options.GENERATE_JACK_LIBRARY).booleanValue()) {
+ if (ThreadConfig.get(Options.GENERATE_JAYCE_IN_LIBRARY).booleanValue()) {
request.addProduction(JayceInLibraryProduct.class);
}
@@ -563,7 +563,7 @@ public class TestTools {
TestTools.createTempDir("unused", "").getPath(), hooks, Existence.MUST_EXIST,
Permission.WRITE, ChangePermission.NOCHANGE)), Jack.getEmitterId(),
Jack.getVersionString());
- session.setJackInternalOutputLibrary(outputLibrary);
+ session.setJackOutputLibrary(outputLibrary);
PlanBuilder<JSession> planBuilder = request.getPlanBuilder(JSession.class);
Jack.fillDexPlan(options, planBuilder);