Remove duplicate API sample jar.
Change-Id: I43e246b14158b95cf455284fad9efbf57602f476
diff --git a/build.gradle b/build.gradle
index 6050eda..d4a1c75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1050,12 +1050,6 @@
destinationDir file('build/libs')
}
-task buildD8ApiUsageSample(type: Jar) {
- from sourceSets.apiUsageSample.output
- baseName 'd8_api_usage_sample'
- destinationDir file('tests')
-}
-
task buildR8ApiUsageSample(type: Jar) {
from sourceSets.apiUsageSample.output
baseName 'r8_api_usage_sample'
@@ -1063,7 +1057,6 @@
}
task buildApiSampleJars {
- dependsOn buildD8ApiUsageSample
dependsOn buildR8ApiUsageSample
}
diff --git a/src/test/java/com/android/tools/r8/D8ApiBinaryCompatibilityTests.java b/src/test/java/com/android/tools/r8/D8ApiBinaryCompatibilityTests.java
index 9c3d9c4..846bc6b 100644
--- a/src/test/java/com/android/tools/r8/D8ApiBinaryCompatibilityTests.java
+++ b/src/test/java/com/android/tools/r8/D8ApiBinaryCompatibilityTests.java
@@ -37,7 +37,7 @@
@Test
public void testCompatibility() throws IOException {
- Path jar = Paths.get("tests", "d8_api_usage_sample.jar");
+ Path jar = ToolHelper.API_SAMPLE_JAR;
String main = "com.android.tools.apiusagesample.D8ApiUsageSample";
int minApiLevel = AndroidApiLevel.K.getLevel();
diff --git a/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java b/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
index b9676d5..954d773 100644
--- a/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
+++ b/src/test/java/com/android/tools/r8/R8ApiBinaryCompatibilityTests.java
@@ -25,7 +25,7 @@
@RunWith(Parameterized.class)
public class R8ApiBinaryCompatibilityTests extends TestBase {
- static final Path JAR = Paths.get("tests", "r8_api_usage_sample.jar");
+ static final Path JAR = ToolHelper.API_SAMPLE_JAR;
static final String MAIN = "com.android.tools.apiusagesample.R8ApiUsageSample";
static final AndroidApiLevel MIN_API = AndroidApiLevel.K;
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 3d00718..9ad7a70 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -120,6 +120,8 @@
public static final String JAVA_CLASSES_DIR = BUILD_DIR + "classes/java/";
public static final String JDK_11_TESTS_CLASSES_DIR = JAVA_CLASSES_DIR + "jdk11Tests/";
+ public static final Path API_SAMPLE_JAR = Paths.get("tests", "r8_api_usage_sample.jar");
+
public static final String LINE_SEPARATOR = StringUtils.LINE_SEPARATOR;
public static final String CLASSPATH_SEPARATOR = File.pathSeparator;
diff --git a/tests/d8_api_usage_sample.jar b/tests/d8_api_usage_sample.jar
deleted file mode 100644
index 07dd629..0000000
--- a/tests/d8_api_usage_sample.jar
+++ /dev/null
Binary files differ
