Replace --min-sdk-version with shorter and less confusing --min-api flag.
R=sgjesse
Change-Id: Iaf5eaf91d33dc3b89a148d7cf8c7a8305c88fc1d
diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index 6a72eed..941a890 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -112,16 +112,16 @@
"Usage: d8 [options] <input-files>",
" where <input-files> are any combination of dex, class, zip, jar, or apk files",
" and options are:",
- " --debug # compile with debugging information (default enabled).",
- " --release # compile without debugging information.",
- " --output <file> # output result in <outfile>.",
+ " --debug # Compile with debugging information (default).",
+ " --release # Compile without debugging information.",
+ " --output <file> # Output result in <outfile>.",
" # <file> must be an existing directory or a zip file.",
" --lib <file> # Add <file> as a library resource.",
" --classpath <file> # Add <file> as a classpath resource.",
- " --min-sdk-version # minimum Android API level compatibility",
- " --file-per-class # produce a separate dex file per class",
- " --version # print the version of d8.",
- " --help # print this message."));
+ " --min-api # Minimum Android API level compatibility",
+ " --file-per-class # Produce a separate dex file per class",
+ " --version # Print the version of d8.",
+ " --help # Print this message."));
public static Builder builder() {
return new Builder();
@@ -169,7 +169,7 @@
builder.addLibraryFiles(Paths.get(args[++i]));
} else if (arg.equals("--classpath")) {
builder.addClasspathFiles(Paths.get(args[++i]));
- } else if (arg.equals("--min-sdk-version")) {
+ } else if (arg.equals("--min-api")) {
builder.setMinApiLevel(Integer.valueOf(args[++i]));
} else {
if (arg.startsWith("--")) {
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 66990a0..8fa9543 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -198,7 +198,7 @@
if (options.minApiLevel >= Constants.ANDROID_O_API
&& !options.mainDexKeepRules.isEmpty()) {
throw new CompilationError("Automatic main dex list is not supported when compiling for"
- + " android O and later (--min-sdk-version " + Constants.ANDROID_O_API + ")");
+ + " android O and later (--min-api " + Constants.ANDROID_O_API + ")");
}
DexApplication application =
new ApplicationReader(inputApp, options, timing).read(executorService);
diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index fbcd638..ebf1983 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -193,12 +193,12 @@
"Usage: r8 [options] <input-files>",
" where <input-files> are any combination of dex, class, zip, jar, or apk files",
" and options are:",
- " --debug # Compile with debugging information (default enabled).",
- " --release # Compile without debugging information.",
+ " --release # Compile without debugging information (default).",
+ " --debug # Compile with debugging information.",
" --output <file> # Output result in <file>.",
" # <file> must be an existing directory or a zip file.",
" --lib <file> # Add <file> as a library resource.",
- " --min-sdk-version # Minimum Android API level compatibility.",
+ " --min-api # Minimum Android API level compatibility.",
" --pg-conf <file> # Proguard configuration <file> (implies tree shaking/minification).",
" --pg-map <file> # Proguard map <file>.",
" --no-tree-shaking # Force disable tree shaking of unreachable classes.",
@@ -265,7 +265,7 @@
builder.setOutputPath(Paths.get(outputPath));
} else if (arg.equals("--lib")) {
builder.addLibraryFiles(Paths.get(args[++i]));
- } else if (arg.equals("--min-sdk-version")) {
+ } else if (arg.equals("--min-api")) {
builder.setMinApiLevel(Integer.valueOf(args[++i]));
} else if (arg.equals("--no-tree-shaking")) {
builder.setTreeShaking(false);
diff --git a/src/main/java/com/android/tools/r8/dex/FileWriter.java b/src/main/java/com/android/tools/r8/dex/FileWriter.java
index 6d6f858..6c6c3e1 100644
--- a/src/main/java/com/android/tools/r8/dex/FileWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/FileWriter.java
@@ -294,7 +294,7 @@
if (method.accessFlags.isStatic()) {
if (!options.canUseDefaultAndStaticInterfaceMethods()) {
throw new CompilationError("Static interface methods are only supported "
- + "starting with Android N (--min-sdk-version " + Constants.ANDROID_N_API + "): "
+ + "starting with Android N (--min-api " + Constants.ANDROID_N_API + "): "
+ method.method.toSourceString());
}
@@ -306,7 +306,7 @@
if (!method.accessFlags.isAbstract() && !method.accessFlags.isPrivate() &&
!options.canUseDefaultAndStaticInterfaceMethods()) {
throw new CompilationError("Default interface methods are only supported "
- + "starting with Android N (--min-sdk-version " + Constants.ANDROID_N_API + "): "
+ + "starting with Android N (--min-api " + Constants.ANDROID_N_API + "): "
+ method.method.toSourceString());
}
}
@@ -316,7 +316,7 @@
continue;
}
throw new CompilationError("Private interface methods are only supported "
- + "starting with Android N (--min-sdk-version " + Constants.ANDROID_N_API + "): "
+ + "starting with Android N (--min-api " + Constants.ANDROID_N_API + "): "
+ method.method.toSourceString());
}
@@ -1331,7 +1331,7 @@
private void checkThatInvokeCustomIsAllowed() {
if (!options.canUseInvokeCustom()) {
- throw new CompilationError("Invoke-custom is unsupported before Android O (--min-sdk-version "
+ throw new CompilationError("Invoke-custom is unsupported before Android O (--min-api "
+ Constants.ANDROID_O_API + ")");
}
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
index 8aaac95..4ce2c4c 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
@@ -912,7 +912,7 @@
if (type == Invoke.Type.POLYMORPHIC && !options.canUseInvokePolymorphic()) {
throw new CompilationError(
"MethodHandle.invoke and MethodHandle.invokeExact is unsupported before "
- + "Android O (--min-sdk-version " + Constants.ANDROID_O_API + ")");
+ + "Android O (--min-api " + Constants.ANDROID_O_API + ")");
}
add(Invoke.create(type, item, callSiteProto, null, arguments));
}
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 66844af..d2dec66 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -90,7 +90,7 @@
private static final String HAMCREST_JAR =
"third_party/gradle/gradle/lib/plugins/hamcrest-core-1.3.jar";
- // Test that required to set min-sdk-version to a specific value.
+ // Test that required to set min-api to a specific value.
private static Map<String, Integer> needMinSdkVersion =
new ImmutableMap.Builder<String, Integer>()
// Android O
diff --git a/tools/gmscore_data.py b/tools/gmscore_data.py
index 9939e1c..9a1d085 100644
--- a/tools/gmscore_data.py
+++ b/tools/gmscore_data.py
@@ -33,7 +33,7 @@
'pgmap' : os.path.join(V4_BASE, 'proguard.map'),
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v5': {
@@ -42,7 +42,7 @@
'pgmap' : os.path.join(V5_BASE, 'proguard.map'),
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v6': {
@@ -51,7 +51,7 @@
'pgmap' : os.path.join(V6_BASE, 'proguard.map'),
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v7': {
@@ -60,7 +60,7 @@
'pgmap' : os.path.join(V7_BASE, 'proguard.map'),
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v8': {
@@ -69,7 +69,7 @@
'pgmap' : os.path.join(V8_BASE, 'proguard.map'),
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v9': {
@@ -78,17 +78,17 @@
'pgmap': '%s_proguard.map' % V9_PREFIX,
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'deploy' : {
'pgconf': ['%s_proguard.config' % V9_PREFIX],
'inputs': ['%s_deploy.jar' % V9_PREFIX],
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V9_PREFIX],
'pgmap': '%s_proguard.map' % V9_PREFIX,
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'v10': {
@@ -97,17 +97,17 @@
'pgmap': '%s_proguard.map' % V10_PREFIX,
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V10_PREFIX],
'pgconf': ['%s_proguard.config' % V10_PREFIX],
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V10_PREFIX],
'pgmap': '%s_proguard.map' % V10_PREFIX,
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
}
diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 312f4b0a..f3cc9b5 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -5,15 +5,15 @@
import optparse
import os
-import r8
-import d8
import sys
-import utils
import time
-import gmscore_data
-import youtube_data
+import d8
import gmail_data
+import gmscore_data
+import r8
+import utils
+import youtube_data
TYPES = ['dex', 'deploy', 'proguarded']
APPS = ['gmscore', 'youtube', 'gmail']
@@ -125,8 +125,8 @@
inputs = values['inputs']
args.extend(['--output', outdir])
- if 'min-sdk-version' in values:
- args.extend(['--min-sdk-version', values['min-sdk-version']])
+ if 'min-api' in values:
+ args.extend(['--min-api', values['min-api']])
if options.compiler == 'r8':
if 'pgmap' in values:
diff --git a/tools/test_framework.py b/tools/test_framework.py
index 7ef5ff3..810935d 100755
--- a/tools/test_framework.py
+++ b/tools/test_framework.py
@@ -92,7 +92,7 @@
tool_file = DX_JAR
else:
tool_file = D8_JAR
- tool_args = ['--output', temp_dir, '--min-sdk-version', MIN_SDK_VERSION]
+ tool_args = ['--output', temp_dir, '--min-api', MIN_SDK_VERSION]
if args.tool == 'd8-release':
tool_args.append('--release')
diff --git a/tools/youtube_data.py b/tools/youtube_data.py
index 801e246..a3d3791 100644
--- a/tools/youtube_data.py
+++ b/tools/youtube_data.py
@@ -30,18 +30,18 @@
'pgmap': '%s_proguard.map' % V12_10_PREFIX,
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_10_PREFIX],
'pgconf': ['%s_proguard.config' % V12_10_PREFIX,
'%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V12_10_PREFIX],
'pgmap': '%s_proguard.map' % V12_10_PREFIX,
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'12.17': {
@@ -50,18 +50,18 @@
'pgmap': '%s_proguard.map' % V12_17_PREFIX,
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_17_PREFIX],
'pgconf': ['%s_proguard.config' % V12_17_PREFIX,
'%s/proguardsettings/YouTubeRelease_proguard.config' % THIRD_PARTY],
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'proguarded' : {
'inputs': ['%s_proguard.jar' % V12_17_PREFIX],
'pgmap': '%s_proguard.map' % V12_17_PREFIX,
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
'12.22': {
@@ -70,7 +70,7 @@
'pgmap': '%s_proguard.map' % V12_22_PREFIX,
'libraries' : [ANDROID_JAR],
'r8-flags': '--ignore-missing-classes',
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
},
'deploy' : {
'inputs': ['%s_deploy.jar' % V12_22_PREFIX],
@@ -85,7 +85,7 @@
'proguarded' : {
'inputs': ['%s_proguard.jar' % V12_22_PREFIX],
'pgmap': '%s_proguard.map' % V12_22_PREFIX,
- 'min-sdk-version' : ANDROID_L_API,
+ 'min-api' : ANDROID_L_API,
}
},
}
