Remove old D8 target
This is unused
Change-Id: I22bb09e0b94e991d5d4278a22195a7e96d3880b8
diff --git a/build.gradle b/build.gradle
index de4adfc..5f7b6d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -929,15 +929,6 @@
outputs.file "${buildDir}/libs/r8_no_manifest.jar"
}
-task D8(type: Jar) {
- dependsOn r8
- from zipTree(r8.outputs.files[0])
- archiveFileName = 'd8.jar'
- manifest {
- attributes 'Main-Class': 'com.android.tools.r8.D8'
- }
-}
-
def baseCompilerCommandLine(compiler, args = []) {
// Execute r8 commands against a stable r8 with dependencies.
// TODO(b/139725780): See if we can remove or lower the heap size (-Xmx8g).
diff --git a/src/test/java/com/android/tools/r8/SanityCheck.java b/src/test/java/com/android/tools/r8/SanityCheck.java
index df1486c..c461475 100644
--- a/src/test/java/com/android/tools/r8/SanityCheck.java
+++ b/src/test/java/com/android/tools/r8/SanityCheck.java
@@ -117,7 +117,6 @@
@Test
public void testJarsContent() throws Exception {
- checkJarContent(ToolHelper.D8_JAR);
checkJarContent(ToolHelper.R8_JAR);
}
}
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index bf484bc..4b8b7ea 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -161,7 +161,6 @@
public static final long BOT_MAX_HEAP_SIZE = 7908360192L;
- public static final Path D8_JAR = Paths.get(LIBS_DIR, "d8.jar");
public static final Path R8_JAR = Paths.get(LIBS_DIR, "r8.jar");
public static final Path R8_WITH_DEPS_JAR = Paths.get(LIBS_DIR, "r8_with_deps.jar");
public static final Path R8_WITHOUT_DEPS_JAR =
diff --git a/tools/archive.py b/tools/archive.py
index 893fc19..d7bf1a9 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -33,22 +33,13 @@
type="string", action="store")
return result.parse_args()
-def GetToolVersion(jar_path):
- # TODO(mkroghj) This would not work for r8-lib, maybe use utils.getR8Version.
- output = subprocess.check_output([
- jdk.GetJavaExecutable(), '-jar', jar_path, '--version'
- ]).decode('utf-8')
- return output.splitlines()[0].strip()
-
def GetVersion():
- r8_version = GetToolVersion(utils.R8_JAR)
- d8_version = GetToolVersion(utils.D8_JAR)
- # The version printed is "D8 vVERSION_NUMBER" and "R8 vVERSION_NUMBER"
- # Sanity check that versions match.
- if d8_version.split()[1] != r8_version.split()[1]:
- raise Exception(
- 'Version mismatch: \n%s\n%s' % (d8_version, r8_version))
- return d8_version.split()[1]
+ output = subprocess.check_output([
+ jdk.GetJavaExecutable(), '-cp', utils.R8_JAR, 'com.android.tools.r8.R8',
+ '--version'
+ ]).decode('utf-8')
+ r8_version = output.splitlines()[0].strip()
+ return r8_version.split()[1]
def GetGitBranches():
return subprocess.check_output(['git', 'show', '-s', '--pretty=%d', 'HEAD'])
@@ -157,7 +148,6 @@
# The '-Pno_internal' flag is important because we generate the lib based on uses in tests.
gradle.RunGradle([
utils.R8,
- utils.D8,
utils.R8LIB,
utils.R8LIB_NO_DEPS,
utils.R8RETRACE,
@@ -193,7 +183,6 @@
create_maven_release.write_default_r8_pom_file(default_pom_file, version)
for file in [
- utils.D8_JAR,
utils.R8_JAR,
utils.R8LIB_JAR,
utils.R8LIB_JAR + '.map',
diff --git a/tools/utils.py b/tools/utils.py
index 57af1e0..c831d8c 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -51,7 +51,6 @@
R8LIB_TESTS_DEPS_TARGET = R8_TESTS_DEPS_TARGET
ALL_DEPS_JAR = os.path.join(LIBS, 'deps_all.jar')
-D8_JAR = os.path.join(LIBS, 'd8.jar')
R8_JAR = os.path.join(LIBS, 'r8.jar')
R8_WITH_RELOCATED_DEPS_JAR = os.path.join(LIBS, 'r8_with_relocated_deps.jar')
R8LIB_JAR = os.path.join(LIBS, 'r8lib.jar')
