Remove fall-back for android.jar in command line
Bug: b/289365156
Change-Id: I0bf37f99bf4585a1128aef5a5f054bc12083709f
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/AbstractGenerateFiles.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/AbstractGenerateFiles.java
index 48e9575..f263c2e 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/AbstractGenerateFiles.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/AbstractGenerateFiles.java
@@ -14,9 +14,7 @@
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.Reporter;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.Collection;
public abstract class AbstractGenerateFiles {
@@ -64,26 +62,4 @@
}
abstract AndroidApiLevel run() throws Exception;
-
- // TODO(b/289365156): Move this out.
- private static String getFallBackAndroidJarPath(AndroidApiLevel apiLevel) {
- String jar =
- apiLevel == AndroidApiLevel.MASTER
- ? "third_party/android_jar/lib-master/android.jar"
- : String.format("third_party/android_jar/lib-v%d/android.jar", apiLevel.getLevel());
- Path jarPath = Paths.get(jar);
- if (!Files.exists(jarPath)) {
- throw new RuntimeException(
- "Generate files tools should pass a valid recent android.jar as parameter if used outside"
- + " of the r8 repository. Missing file: "
- + jarPath);
- }
- return jar;
- }
-
- static String getAndroidJarPath(String[] args, int fullLength) {
- return args.length == fullLength
- ? args[fullLength - 1]
- : getFallBackAndroidJarPath(MAX_TESTED_ANDROID_API_LEVEL);
- }
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsList.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsList.java
index f9abbbf..9381899 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsList.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/DesugaredMethodsList.java
@@ -107,7 +107,7 @@
for (ProgramResourceProvider programResourceProvider : getImplementationArg(args[2])) {
builder.addDesugarLibraryImplementation(programResourceProvider);
}
- builder.addLibrary(new ArchiveClassFileProvider(Paths.get(getAndroidJarPath(args, 5))));
+ builder.addLibrary(new ArchiveClassFileProvider(Paths.get(args[4])));
DesugaredMethodsList.run(builder.build());
return;
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateDesugaredLibraryLintFiles.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateDesugaredLibraryLintFiles.java
index 0f7c141..9688716 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateDesugaredLibraryLintFiles.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateDesugaredLibraryLintFiles.java
@@ -173,12 +173,12 @@
}
public static void main(String[] args) throws Exception {
- if (args.length == 3 || args.length == 4) {
+ if (args.length == 4) {
new GenerateDesugaredLibraryLintFiles(
StringResource.fromFile(Paths.get(args[0])),
ImmutableList.of(ArchiveProgramResourceProvider.fromArchive(Paths.get(args[1]))),
Paths.get(args[2]),
- ImmutableList.of(new ArchiveClassFileProvider(Paths.get(getAndroidJarPath(args, 4)))))
+ ImmutableList.of(new ArchiveClassFileProvider(Paths.get(args[3]))))
.run();
return;
}
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateHtmlDoc.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateHtmlDoc.java
index 3c341fa..60f6e1b 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateHtmlDoc.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/GenerateHtmlDoc.java
@@ -575,13 +575,12 @@
public static void main(String[] args) throws Exception {
if (args[0].equals("--generate-api-docs")) {
- if (args.length == 4 || args.length == 5) {
+ if (args.length == 5) {
new GenerateHtmlDoc(
StringResource.fromFile(Paths.get(args[1])),
ImmutableList.of(ArchiveProgramResourceProvider.fromArchive(Paths.get(args[2]))),
Paths.get(args[3]),
- ImmutableList.of(
- new ArchiveClassFileProvider(Paths.get(getAndroidJarPath(args, 4)))))
+ ImmutableList.of(new ArchiveClassFileProvider(Paths.get(args[4]))))
.run();
return;
}
