Skip to content

Change platform lookup directory from android-N to android-24. #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2016
Merged

Change platform lookup directory from android-N to android-24. #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,6 @@ internal static IEnumerable<string> GetFrameworkAssembliesToTreatAsUserAssemblie
public static string GetPlatformApiLevelName (string platformApiLevel)
{
switch (platformApiLevel.Trim ()) {
case "24":
return "N";
default:
return platformApiLevel;
}
Expand All @@ -421,8 +419,6 @@ public static string GetPlatformApiLevelName (string platformApiLevel)
public static string GetPlatformApiLevel (string platformApiLevelName)
{
switch (platformApiLevelName.Trim ()) {
case "N":
return "24";
default:
return platformApiLevelName;
}
Expand Down
5 changes: 2 additions & 3 deletions src/Xamarin.Android.Build.Utilities/AndroidSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ static Version TryParseVersion (string v)
return null;
}

// it was useful when android-21 was android-L, or android-23 was android-MNC.
// We will use this when similar preview release is out.
static string ToApiName (int apiLevel)
{
// Support for N Preview
if (apiLevel == 24)
return "N";
return apiLevel.ToString ();
}

Expand Down