Skip to content

Update MaximumCompatibleNDKMajorVersion to be 23 #144

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
dellis1972 merged 3 commits into from
Nov 12, 2021
Merged

Update MaximumCompatibleNDKMajorVersion to be 23 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfec77c
Update MaximumCompatibleNDKMajorVersion to be 22
dellis1972 Nov 10, 2021
15ed26b
Update to 23
dellis1972 Nov 10, 2021
f1904c6
Update to 23
dellis1972 Nov 10, 2021
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
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ abstract class AndroidSdkBase
{
// When this changes, update the test: Xamarin.Android.Tools.Tests.AndroidSdkInfoTests.Ndk_MultipleNdkVersionsInSdk
const int MinimumCompatibleNDKMajorVersion = 16;
const int MaximumCompatibleNDKMajorVersion = 21;
const int MaximumCompatibleNDKMajorVersion = 23;

static readonly char[] SourcePropertiesKeyValueSplit = new char[] { '=' };

Expand Down
22 changes: 12 additions & 10 deletions tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void Ndk_MultipleNdkVersionsInSdk ()
{
// Must match like-named constants in AndroidSdkBase
const int MinimumCompatibleNDKMajorVersion = 16;
const int MaximumCompatibleNDKMajorVersion = 21;
const int MaximumCompatibleNDKMajorVersion = 23;

CreateSdks(out string root, out string jdk, out string ndk, out string sdk);

Expand All @@ -91,8 +91,10 @@ public void Ndk_MultipleNdkVersionsInSdk ()
"21.2.6472646",
"21.3.6528147",
"22.0.7026061",
"22.1.7171670",
"23.1.7779620",
};
string expectedVersion = "21.3.6528147";
string expectedVersion = "23.1.7779620";
string expectedNdkPath = Path.Combine (sdk, "ndk", expectedVersion);

try {
Expand Down Expand Up @@ -137,7 +139,7 @@ public void Ndk_PathInSdk()
File.WriteAllText(Path.Combine(ndkPath, $"ndk-stack{extension}"), "");

var info = new AndroidSdkInfo(logger, androidSdkPath: sdk, androidNdkPath: null, javaSdkPath: jdk);

Assert.AreEqual(ndkPath, info.AndroidNdkPath, "AndroidNdkPath not found inside sdk!");
}
finally
Expand Down Expand Up @@ -308,7 +310,7 @@ public void Sdk_GetCommandLineToolsPaths ()
var latestToolsVersion = "latest";
var toolsVersion = "2.1";
var higherToolsVersion = "11.2";

void recreateCmdlineToolsDirectory () {
Directory.Delete (cmdlineTools, recursive: true);
Directory.CreateDirectory (cmdlineTools);
Expand All @@ -324,7 +326,7 @@ void recreateCmdlineToolsDirectory () {

Assert.AreEqual (toolsPaths.Count (), 1, "Incorrect number of elements");
Assert.AreEqual (toolsPaths.First (), Path.Combine (sdk, "cmdline-tools", toolsVersion), "Incorrect command line tools path");

// Test that cmdline-tools is preferred over tools
recreateCmdlineToolsDirectory();
CreateFauxAndroidSdkToolsDirectory (sdk, createToolsDir: true, toolsVersion: latestToolsVersion, createOldToolsDir: true);
Expand All @@ -347,7 +349,7 @@ void recreateCmdlineToolsDirectory () {
&& toolsPathsList [1].Equals (Path.Combine (sdk, "cmdline-tools", higherToolsVersion), StringComparison.Ordinal)
&& toolsPathsList [2].Equals (Path.Combine (sdk, "cmdline-tools", toolsVersion), StringComparison.Ordinal)
&& toolsPathsList [3].Equals (Path.Combine (sdk, "tools"), StringComparison.Ordinal);

Assert.IsTrue (isOrderCorrect, "Tools order is not descending");
} finally {
Directory.Delete (root, recursive: true);
Expand Down Expand Up @@ -386,10 +388,10 @@ static void CreateFauxAndroidSdkToolsDirectory (string androidSdkDirectory, bool
if (createToolsDir) {
string androidSdkToolsPath = Path.Combine (androidSdkDirectory, "cmdline-tools", toolsVersion ?? "1.0");
string androidSdkToolsBinPath = Path.Combine (androidSdkToolsPath, "bin");

Directory.CreateDirectory (androidSdkToolsPath);
Directory.CreateDirectory (androidSdkToolsBinPath);

File.WriteAllText (Path.Combine (androidSdkToolsBinPath, IsWindows ? "lint.bat" : "lint"), "");
}

Expand All @@ -399,7 +401,7 @@ static void CreateFauxAndroidSdkToolsDirectory (string androidSdkDirectory, bool

Directory.CreateDirectory (androidSdkToolsPath);
Directory.CreateDirectory (androidSdkToolsBinPath);

File.WriteAllText (Path.Combine (androidSdkToolsBinPath, IsWindows ? "lint.bat" : "lint"), "");
}

Expand All @@ -414,7 +416,7 @@ static void CreateFauxAndroidSdkDirectory (
ApiInfo[] apiLevels = null)
{
CreateFauxAndroidSdkToolsDirectory (androidSdkDirectory, createToolsDir, toolsVersion, createOldToolsDir);

var androidSdkPlatformToolsPath = Path.Combine (androidSdkDirectory, "platform-tools");
var androidSdkPlatformsPath = Path.Combine (androidSdkDirectory, "platforms");
var androidSdkBuildToolsPath = Path.Combine (androidSdkDirectory, "build-tools", buildToolsVersion);
Expand Down