move D8 --intermediate to D8Options

Summary: We have a list of options, this should be one of them instead of being a random boolean

Reviewed By: christolliday

fbshipit-source-id: 5b9512ebceb2df0f5eaef409289f0ca85ba4605e

Author: IanChilds

src/com/facebook/buck/android/D8Step.java

@@ -69,7 +69,6 @@ public class D8Step extends IsolatedStep {
   private final Set<Path> filesToDex;
   private final Set<D8Options> options;
   private final Optional<Path> primaryDexClassNamesPath;
-  private final boolean intermediate;
   // used to differentiate different dexing buckets (if any)
   private final Optional<String> bucketId;
   private final Optional<Integer> minSdkVersion;
@@ -95,7 +94,6 @@ public D8Step(
         filesToDex,
         options,
         Optional.empty(),
-        false,
         null,
         Optional.empty(),
         Optional.empty() /* minSdkVersion */);
@@ -117,7 +115,6 @@ public D8Step(
       Iterable<Path> filesToDex,
       EnumSet<D8Options> options,
       Optional<Path> primaryDexClassNamesPath,
-      boolean intermediate,
       @Nullable Collection<Path> classpathFiles,
       Optional<String> bucketId,
       Optional<Integer> minSdkVersion) {
@@ -129,7 +126,6 @@ public D8Step(
     this.filesToDex = ImmutableSet.copyOf(filesToDex);
     this.options = Sets.immutableEnumSet(options);
     this.primaryDexClassNamesPath = primaryDexClassNamesPath.map(filesystem::resolve);
-    this.intermediate = intermediate;
     this.bucketId = bucketId;
     this.minSdkVersion = minSdkVersion;
   }
@@ -163,7 +159,7 @@ private int executeInProcess(IsolatedExecutionContext context) throws IOExceptio
       D8Command.Builder builder =
           D8Command.builder(diagnosticsHandler)
               .addProgramFiles(inputs)
-              .setIntermediate(intermediate)
+              .setIntermediate(options.contains(D8Options.INTERMEDIATE))
               .addLibraryFiles(androidPlatformTarget.getAndroidJar())
               .setMode(
                   options.contains(D8Options.NO_OPTIMIZE)
@@ -273,7 +269,7 @@ public String getIsolatedStepDescription(IsolatedExecutionContext context) {
       commandArgs.add("--force-jumbo");
     }
 
-    if (intermediate) {
+    if (options.contains(D8Options.INTERMEDIATE)) {
       commandArgs.add("--intermediate");
     }
 

src/com/facebook/buck/android/DexProducedFromJavaLibrary.java

@@ -202,7 +202,8 @@ public ImmutableList<Step> getBuildSteps(
 
         // To be conservative, use --force-jumbo for these intermediate .dex files so that they can
         // be merged into a final classes.dex that uses jumbo instructions.
-        EnumSet<D8Options> options = EnumSet.of(D8Options.NO_OPTIMIZE, D8Options.FORCE_JUMBO);
+        EnumSet<D8Options> options =
+            EnumSet.of(D8Options.NO_OPTIMIZE, D8Options.FORCE_JUMBO, D8Options.INTERMEDIATE);
         if (!desugarEnabled) {
           options.add(D8Options.NO_DESUGAR);
         }
@@ -214,7 +215,6 @@ public ImmutableList<Step> getBuildSteps(
                 Collections.singleton(pathToOutputFile.getPath()),
                 options,
                 Optional.empty(),
-                true,
                 getAbsolutePaths(desugarDeps, sourcePathResolverAdapter),
                 Optional.empty(),
                 Optional.empty() /* minSdkVersion */);

src/com/facebook/buck/android/SmartDexingStep.java

@@ -543,7 +543,6 @@ static void createDxStepForDxPseudoRule(
               filesToDex,
               dxOptions,
               primaryDexClassNamesPath,
-              false,
               classpathFiles,
               buckedId,
               minSdkVersion));
@@ -583,7 +582,6 @@ static void createDxStepForDxPseudoRule(
               filesToDex,
               dxOptions,
               primaryDexClassNamesPath,
-              false,
               classpathFiles,
               buckedId,
               minSdkVersion));
@@ -617,7 +615,6 @@ static void createDxStepForDxPseudoRule(
               filesToDex,
               dxOptions,
               primaryDexClassNamesPath,
-              false,
               classpathFiles,
               buckedId,
               minSdkVersion));

src/com/facebook/buck/android/dex/D8Options.java

@@ -26,5 +26,8 @@ public enum D8Options {
 
   /** Disable java 8 desugaring when running D8 dexing tool. */
   NO_DESUGAR,
+
+  /** Compile an intermediate result intended for later merging */
+  INTERMEDIATE,
   ;
 }

test/com/facebook/buck/android/D8StepTest.java

@@ -155,7 +155,6 @@ public void testMinSdkVersion() throws IOException {
               SAMPLE_FILES_TO_DEX,
               EnumSet.noneOf(D8Options.class),
               Optional.empty(),
-              false,
               ImmutableSet.of(),
               Optional.empty(),
               Optional.of(28));
@@ -196,7 +195,6 @@ public void testMainDexList() throws IOException {
               SAMPLE_FILES_TO_DEX,
               EnumSet.noneOf(D8Options.class),
               Optional.of(mainDexFilePath),
-              false,
               ImmutableSet.of(),
               Optional.empty(),
               Optional.empty());

test/com/facebook/buck/android/DexProducedFromJavaLibraryTest.java

@@ -113,6 +113,14 @@ public ImmutableSortedMap<String, HashCode> getClassNamesToHashes() {
                 .getSourcePathResolver()
                 .getAbsolutePath(javaLibRule.getSourcePathToOutput())
                 .getPath()));
+
+    assertThat(
+        d8Step.getIsolatedStepDescription(null),
+        Matchers.allOf(
+            Matchers.containsString("--no-desugaring"),
+            Matchers.containsString("--intermediate"),
+            Matchers.containsString("--force-jumbo"),
+            Matchers.containsString("--debug")));
   }
 
   private void createFiles(ProjectFilesystem filesystem, String... paths) throws IOException {