diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-05-28 03:29:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-28 03:29:53 +0000 |
| commit | c06a076f6795edaf3baf1ec24d732080b4433ec1 (patch) | |
| tree | 8fbf5436676de7477cb1b315ee6083d1d0efe5d1 | |
| parent | 93aa02793ea1594d788a3ec67139db183dc307b4 (diff) | |
| parent | 9df130a98bbd9824d191bd33a2c439c1f407a758 (diff) | |
| download | sdk-c06a076f6795edaf3baf1ec24d732080b4433ec1.zip sdk-c06a076f6795edaf3baf1ec24d732080b4433ec1.tar.gz sdk-c06a076f6795edaf3baf1ec24d732080b4433ec1.tar.bz2 | |
Merge "Fix ADT." into idea133
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java index 056132d..6d2d1c1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java @@ -931,11 +931,19 @@ public class ManifestInfo { } } - Integer i = AndroidManifest.getTargetSdkVersion(manifestFile); - if (i == null) { + value = AndroidManifest.getTargetSdkVersion(manifestFile); + if (value == null) { mTargetSdkVersion = mMinSdkVersion; - } else { - mTargetSdkVersion = i.intValue(); + } else if (value instanceof String) { + // handle codename, only if we can resolve it. + if (Sdk.getCurrent() != null) { + IAndroidTarget target = Sdk.getCurrent().getTargetFromHashString( + "android-" + value); //$NON-NLS-1$ + if (target != null) { + // codename future API level is current api + 1 + mTargetSdkVersion = target.getVersion().getApiLevel() + 1; + } + } } } catch (XPathExpressionException e) { // do nothing we'll use 1 below. |