Revert "Jayce and dex files must be put into output library"

This reverts commit 633d91e916d0e3df84f73b16cf32a7b057fb5b0f.

Change-Id: I721fad299ffc1bf88828c1abf091aa122594449b

2 files changed, 17 insertions, 12 deletions

diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index 7f4fd581..b25fc4cc 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -69,7 +69,7 @@ import com.android.jack.frontend.VirtualMethodsMarker;
 import com.android.jack.frontend.java.JackBatchCompiler;
 import com.android.jack.frontend.java.JackBatchCompiler.TransportExceptionAroundEcjError;
 import com.android.jack.frontend.java.JackBatchCompiler.TransportJUEAroundEcjError;
-import com.android.jack.incremental.GenerateLibraryFromIncrementalFolder;
+import com.android.jack.incremental.Incremental;
 import com.android.jack.ir.JackFormatIr;
 import com.android.jack.ir.JavaSourceIr;
 import com.android.jack.ir.ast.JClass;
@@ -515,8 +515,8 @@ public abstract class Jack {
       if (config.get(MultiDexLegacy.MULTIDEX_LEGACY).booleanValue()) {
         request.addFeature(MultiDexLegacy.class);
       }
-      if (config.get(Options.GENERATE_LIBRARY_FROM_INCREMENTAL_FOLDER).booleanValue()) {
-        request.addFeature(GenerateLibraryFromIncrementalFolder.class);
+      if (config.get(Options.INCREMENTAL_MODE).booleanValue()) {
+        request.addFeature(Incremental.class);
       }
 
       request.addInitialTagsOrMarkers(getJavaSourceInitialTagSet());
@@ -867,6 +867,7 @@ public abstract class Jack {
     FeatureSet features = planBuilder.getRequest().getFeatures();
     ProductionSet productions = planBuilder.getRequest().getTargetProductions();
     boolean hasSanityChecks = features.contains(SanityChecks.class);
+    Config config = ThreadConfig.getConfig();
 
     // TODO(jack-team): Remove this hack
     boolean preDexing = !getSession().getImportedLibraries().isEmpty();
@@ -1012,10 +1013,12 @@ public abstract class Jack {
     {
       SubPlanBuilder<JDefinedClassOrInterface> typePlan;
       // In incremental library mode, Jayce files must be copied into output library
-      if (features.contains(GenerateLibraryFromIncrementalFolder.class)) {
-        typePlan = planBuilder.appendSubPlan(JDefinedClassOrInterfaceAdapter.class);
-      } else {
+      if (features.contains(Incremental.class)
+          && ((!config.get(Options.GENERATE_JACK_LIBRARY).booleanValue())
+              || config.get(Options.LIBRARY_OUTPUT_CONTAINER_TYPE) != Container.ZIP)) {
         typePlan = planBuilder.appendSubPlan(ExcludeTypeFromLibWithBinaryAdapter.class);
+      } else {
+        typePlan = planBuilder.appendSubPlan(JDefinedClassOrInterfaceAdapter.class);
       }
       if (productions.contains(JayceInLibraryProduct.class)) {
         typePlan.append(JayceInLibraryWriter.class);
@@ -1165,10 +1168,12 @@ public abstract class Jack {
     {
       SubPlanBuilder<JDefinedClassOrInterface> typePlan;
       // In incremental library mode, dex files must be copied into output library
-      if (features.contains(GenerateLibraryFromIncrementalFolder.class)) {
-        typePlan = planBuilder.appendSubPlan(JDefinedClassOrInterfaceAdapter.class);
-      } else {
+      if (features.contains(Incremental.class)
+          && ((!config.get(Options.GENERATE_JACK_LIBRARY).booleanValue())
+              || config.get(Options.LIBRARY_OUTPUT_CONTAINER_TYPE) != Container.ZIP)) {
         typePlan = planBuilder.appendSubPlan(ExcludeTypeFromLibWithBinaryAdapter.class);
+      } else {
+        typePlan = planBuilder.appendSubPlan(JDefinedClassOrInterfaceAdapter.class);
       }
       if (productions.contains(DexInLibraryProduct.class)) {
         typePlan.append(DexInLibraryWriter.class);
diff --git a/jack/src/com/android/jack/incremental/GenerateLibraryFromIncrementalFolder.java b/jack/src/com/android/jack/incremental/Incremental.java
index 276c77a6..cc791a2b 100644
--- a/jack/src/com/android/jack/incremental/GenerateLibraryFromIncrementalFolder.java
+++ b/jack/src/com/android/jack/incremental/Incremental.java
@@ -20,8 +20,8 @@ import com.android.sched.item.Description;
 import com.android.sched.item.Feature;
 
 /**
- * A {@link Feature} specifying that a library is generated with incremental support.
+ * A {@link Feature} that represents incremental support.
  */
-@Description("Generate library with incremental support")
-public class GenerateLibraryFromIncrementalFolder implements Feature {
+@Description("Incremental support")
+public class Incremental implements Feature {
 }