am cff78949: am f07bd569: Merge change 21242 into donut

Merge commit 'cff7894961a403ed226d7154c7ce535ba5e0cb8c'

* commit 'cff7894961a403ed226d7154c7ce535ba5e0cb8c':
  Codename in minsdkversion for release platform shows 'null' in error string
This commit is contained in:
Xavier Ducrohet
2009-08-18 08:51:27 -07:00
committed by Android Git Automerger

View File

@@ -358,7 +358,7 @@ public class PreCompilerBuilder extends BaseBuilder {
// platform is not a preview => fatal error // platform is not a preview => fatal error
String msg = String.format( String msg = String.format(
"Manifest attribute '%1$s' is set to '%2$s'. Integer is expected.", "Manifest attribute '%1$s' is set to '%2$s'. Integer is expected.",
ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, codename); ManifestConstants.ATTRIBUTE_MIN_SDK_VERSION, minSdkVersion);
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);