LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also display error on empty minSdkVersion for preview targets.

Browse Source 
BUG: 2050928
This commit is contained in:
Xavier Ducrohet
2009-08-12 17:57:35 -07:00
parent 9f30bb1c47
commit 7e97a5d23f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/PreCompilerBuilder.java
View File

@@ -335,9 +335,8 @@ public class PreCompilerBuilder extends BaseBuilder {
if (codename != null) { if (codename != null) {
// integer minSdk when the target is a preview => fatal error // integer minSdk when the target is a preview => fatal error
String msg = String.format( String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%3$s'", "Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
codename);
AdtPlugin.printErrorToConsole(project, msg); AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg, BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR); IMarker.SEVERITY_ERROR);
@@ -375,6 +374,17 @@ public class PreCompilerBuilder extends BaseBuilder {
stopBuild(msg); stopBuild(msg);
} }
} }
} else if (projectTarget.getVersion().isPreview()) {
// else the minSdkVersion is not set but we are using a preview target.
// Display an error
String codename = projectTarget.getVersion().getCodename();
String msg = String.format(
"Platform %1$s is a preview and requires appication manifests to set %2$s to '%1$s'",
codename, ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION);
AdtPlugin.printErrorToConsole(project, msg);
BaseProjectHelper.addMarker(manifest, AdtConstants.MARKER_ADT, msg,
IMarker.SEVERITY_ERROR);
stopBuild(msg);
} }
if (javaPackage == null || javaPackage.length() == 0) { if (javaPackage == null || javaPackage.length() == 0) {