Remove dx tasks
Bug: 185205222
Change-Id: I2131d78fc6724614df1f1cf4113cc2b8e426e7bc
diff --git a/build.gradle b/build.gradle
index 3c1308d..3725a13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,6 @@
import desugaredlibrary.CustomConversionAsmRewriterTask
-import dx.DexMergerTask
-import dx.DxTask
import net.ltgt.gradle.errorprone.CheckSeverity
import org.gradle.internal.os.OperatingSystem
import tasks.DownloadDependency
diff --git a/buildSrc/src/main/java/dx/DexMergerTask.java b/buildSrc/src/main/java/dx/DexMergerTask.java
deleted file mode 100644
index 409337c..0000000
--- a/buildSrc/src/main/java/dx/DexMergerTask.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package dx;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.SetProperty;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.workers.WorkAction;
-import org.gradle.workers.WorkParameters;
-import org.gradle.workers.WorkerExecutor;
-import utils.Utils;
-
-public class DexMergerTask extends DefaultTask {
-
- private final WorkerExecutor workerExecutor;
-
- private FileCollection source;
- private File destination;
-
- @Inject
- public DexMergerTask(WorkerExecutor workerExecutor) {
- this.workerExecutor = workerExecutor;
- }
-
- @InputFiles
- public FileCollection getSource() {
- return source;
- }
-
- public void setSource(FileCollection source) {
- this.source = source;
- }
-
- @OutputFile
- public File getDestination() {
- return destination;
- }
-
- public void setDestination(File destination) {
- this.destination = destination;
- }
-
- @TaskAction
- void exec() {
- workerExecutor
- .noIsolation()
- .submit(
- RunDexMerger.class,
- parameters -> {
- parameters.getSources().set(source.getFiles());
- parameters.getDestination().set(destination);
- });
- }
-
- public interface RunDexMergerParameters extends WorkParameters {
-
- SetProperty<File> getSources();
-
- RegularFileProperty getDestination();
-
- RegularFileProperty getDexMergerExecutable();
- }
-
- public abstract static class RunDexMerger implements WorkAction<RunDexMergerParameters> {
-
- @Override
- public void execute() {
- try {
- RunDexMergerParameters parameters = getParameters();
- List<String> command = new ArrayList<>();
- command.add(Utils.dexMergerExecutable().toString());
- command.add(parameters.getDestination().getAsFile().get().getCanonicalPath());
- for (File source : parameters.getSources().get()) {
- command.add(source.getCanonicalPath());
- }
- Process dexMerger = new ProcessBuilder(command).inheritIO().start();
- int exitCode = dexMerger.waitFor();
- if (exitCode != 0) {
- throw new RuntimeException("Dex merger failed with code " + exitCode);
- }
- } catch (IOException e) {
- throw new java.io.UncheckedIOException(e);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- }
-}
diff --git a/buildSrc/src/main/java/dx/DxTask.java b/buildSrc/src/main/java/dx/DxTask.java
deleted file mode 100644
index a66733a..0000000
--- a/buildSrc/src/main/java/dx/DxTask.java
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-package dx;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.provider.SetProperty;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.workers.WorkAction;
-import org.gradle.workers.WorkParameters;
-import org.gradle.workers.WorkerExecutor;
-import utils.Utils;
-
-public class DxTask extends DefaultTask {
-
- private final WorkerExecutor workerExecutor;
-
- private FileCollection source;
- private File destination;
- private boolean debug;
-
- @Inject
- public DxTask(WorkerExecutor workerExecutor) {
- this.workerExecutor = workerExecutor;
- }
-
- @InputFiles
- public FileCollection getSource() {
- return source;
- }
-
- public void setSource(FileCollection source) {
- this.source = source;
- }
-
- @OutputDirectory
- public File getDestination() {
- return destination;
- }
-
- public void setDestination(File destination) {
- this.destination = destination;
- }
-
- @Input
- public boolean isDebug() {
- return debug;
- }
-
- public void setDebug(boolean debug) {
- this.debug = debug;
- }
-
- @TaskAction
- void exec() {
- workerExecutor
- .noIsolation()
- .submit(
- RunDx.class,
- parameters -> {
- parameters.getSources().set(source.getFiles());
- parameters.getDestination().set(destination);
- parameters.getDebug().set(debug);
- });
- }
-
- public interface RunDxParameters extends WorkParameters {
-
- SetProperty<File> getSources();
-
- RegularFileProperty getDestination();
-
- Property<Boolean> getDebug();
- }
-
- public abstract static class RunDx implements WorkAction<RunDxParameters> {
-
- @Override
- public void execute() {
- RunDxParameters parameters = getParameters();
- try {
- List<String> command = new ArrayList<>();
- command.add(Utils.dxExecutable().toString());
- command.add("--dex");
- command.add("--output");
- command.add(parameters.getDestination().getAsFile().get().getCanonicalPath());
- if (parameters.getDebug().get()) {
- command.add("--debug");
- }
- for (File source : parameters.getSources().get()) {
- command.add(source.getCanonicalPath());
- }
-
- Process dx = new ProcessBuilder(command).inheritIO().start();
- int exitCode = dx.waitFor();
- if (exitCode != 0) {
- throw new RuntimeException("dx failed with code " + exitCode);
- }
- } catch (IOException e) {
- throw new UncheckedIOException(e);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- }
-}
