Rename '--print-mapping' to '--pg-map-output'.
The new name '--pg-map-output' is better aligned with the style of the
other R8 options than '--print-mapping' which is borrowed from Proguard.
The recently removed '--pg-map' option will be reintroduced in separate CL
with new semantics.
Bug:
Change-Id: I3e1f7c1baa4dc29bf141b50ae5515f8444d81fb6
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index d0badf2..c1bd7ae 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -447,14 +447,14 @@
outputApp.write(command.getOutputPath(), options.outputMode);
}
- if ((options.proguardConfiguration.isPrintMapping() || options.printMappingFile != null)
+ if ((options.proguardConfiguration.isPrintMapping() || options.proguardMapOutput != null)
&& !options.skipMinification) {
assert outputApp.hasProguardMap();
if (options.proguardConfiguration.isPrintMapping()) {
writeProguardMapToPath(options.proguardConfiguration.getPrintMappingFile(), outputApp);
}
- if (options.printMappingFile != null) {
- writeProguardMapToPath(options.printMappingFile, outputApp);
+ if (options.proguardMapOutput != null) {
+ writeProguardMapToPath(options.proguardMapOutput, outputApp);
}
}
if (options.proguardConfiguration.isPrintSeeds()) {
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 4076a5a..017f79d 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -36,7 +36,7 @@
private Optional<Boolean> discardedChecker = Optional.empty();
private Optional<Boolean> minification = Optional.empty();
private boolean ignoreMissingClasses = false;
- private Path printMappingFile = null;
+ private Path proguardMapOutput = null;
private Builder() {
super(CompilationMode.RELEASE);
@@ -168,8 +168,8 @@
return self();
}
- Builder setPrintMappingFile(Path path) {
- this.printMappingFile = path;
+ Builder setProguardMapOutput(Path path) {
+ this.proguardMapOutput = path;
return self();
}
@@ -241,7 +241,7 @@
useDiscardedChecker,
useMinification,
ignoreMissingClasses,
- printMappingFile);
+ proguardMapOutput);
}
}
@@ -263,7 +263,7 @@
" --min-api # Minimum Android API level compatibility.",
" --pg-conf <file> # Proguard configuration <file> (implies tree",
" # shaking/minification).",
- " --print-mapping <file> # Write name/line mapping to <file>.",
+ " --pg-map-output <file> # Output the resulting name and line mapping to <file>.",
" --no-tree-shaking # Force disable tree shaking of unreachable classes.",
" --no-discarded-checker # Force disable the discarded checker (when tree shaking).",
" --no-minification # Force disable minification of names.",
@@ -281,7 +281,7 @@
private final boolean useDiscardedChecker;
private final boolean useMinification;
private final boolean ignoreMissingClasses;
- private final Path printMappingFile;
+ private final Path proguardMapOutput;
public static Builder builder() {
return new Builder();
@@ -351,8 +351,8 @@
builder.addProguardConfigurationFiles(Paths.get(args[++i]));
} else if (arg.equals("--ignore-missing-classes")) {
builder.setIgnoreMissingClasses(true);
- } else if (arg.equals("--print-mapping")) {
- builder.setPrintMappingFile(Paths.get(args[++i]));
+ } else if (arg.equals("--pg-map-output")) {
+ builder.setProguardMapOutput(Paths.get(args[++i]));
} else if (arg.startsWith("@")) {
// TODO(zerny): Replace this with pipe reading.
String argsFile = arg.substring(1);
@@ -396,7 +396,7 @@
boolean useDiscardedChecker,
boolean useMinification,
boolean ignoreMissingClasses,
- Path printMappingFile) {
+ Path proguardMapOutput) {
super(inputApp, outputPath, outputMode, mode, minApiLevel);
assert proguardConfiguration != null;
assert mainDexKeepRules != null;
@@ -408,7 +408,7 @@
this.useDiscardedChecker = useDiscardedChecker;
this.useMinification = useMinification;
this.ignoreMissingClasses = ignoreMissingClasses;
- this.printMappingFile = printMappingFile;
+ this.proguardMapOutput = proguardMapOutput;
}
private R8Command(boolean printHelp, boolean printVersion) {
@@ -420,7 +420,7 @@
useDiscardedChecker = false;
useMinification = false;
ignoreMissingClasses = false;
- printMappingFile = null;
+ proguardMapOutput = null;
}
public boolean useTreeShaking() {
return useTreeShaking;
@@ -472,7 +472,7 @@
// TODO(zerny): Should we support inlining in debug mode? b/62937285
internal.inlineAccessors = false;
}
- internal.printMappingFile = printMappingFile;
+ internal.proguardMapOutput = proguardMapOutput;
return internal;
}
}
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 36e19bf..0559012 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -124,7 +124,7 @@
// the code contains unsupported byte codes.
public boolean skipReadingDexCode = false;
- public Path printMappingFile = null;
+ public Path proguardMapOutput = null;
public void warningInvalidDebugInfo(DexEncodedMethod method, InvalidDebugInfoException e) {
warningInvalidDebugInfoCount++;
