From 9bbfc6f118b16b1ce93023febef9fc8e510b7663 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 13 Jun 2024 15:31:27 -0400 Subject: [PATCH] Revert "Update dotnet/android-tools submodule (#1228)" This reverts commit 25a06f659a060ebf9d1de2a222fe647733c98f8b. There are some additional considerations to be made around `xamarin-android-tools.override.props` that I didn't account for, we can revisit moving the submodule path at some point in the future. --- .gitmodules | 6 +++--- Directory.Build.props | 2 +- Java.Interop.sln | 2 +- Makefile | 2 +- .../Java.Interop.BootstrapTasks.sln | 2 +- external/android-tools | 1 - external/xamarin-android-tools | 1 + tools/generator/generator.slnf | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) delete mode 160000 external/android-tools create mode 160000 external/xamarin-android-tools diff --git a/.gitmodules b/.gitmodules index 8293abcbf..5349df982 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "external/android-tools"] - path = external/android-tools - url = https://github.com/dotnet/android-tools/ +[submodule "external/xamarin-android-tools"] + path = external/xamarin-android-tools + url = https://github.com/xamarin/xamarin-android-tools.git branch = main diff --git a/Directory.Build.props b/Directory.Build.props index f83fde2a5..6b328f1f9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -51,7 +51,7 @@ - $(MSBuildThisFileDirectory)external\android-tools + $(MSBuildThisFileDirectory)external\xamarin-android-tools dotnet diff --git a/Java.Interop.sln b/Java.Interop.sln index 4b88276b4..e119fb959 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -79,7 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaCall EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.GenericMarshaler", "src\Java.Interop.GenericMarshaler\Java.Interop.GenericMarshaler.csproj", "{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AndroidSdk", "external\android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaSource-Tests", "tests\Java.Interop.Tools.JavaSource-Tests\Java.Interop.Tools.JavaSource-Tests.csproj", "{093B5E94-7FB7-499F-9C11-30944BAFEE25}" EndProject diff --git a/Makefile b/Makefile index e90fac85b..8f31778fd 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ DLLMAP_OS_NAME = linux endif PREPARE_EXTERNAL_FILES = \ - external/android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj + external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj DEPENDENCIES = \ bin/Test$(CONFIGURATION)/libNativeTiming$(NATIVE_EXT) diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.sln b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.sln index 1363cbf16..272f06ea5 100644 --- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.sln +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32104.313 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.BootstrapTasks", "Java.Interop.BootstrapTasks.csproj", "{47C54705-71BA-455D-9F72-780487DE861C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AndroidSdk", "..\..\external\android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{2F8744CF-C265-440A-B976-DEC021324A3E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AndroidSdk", "..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{2F8744CF-C265-440A-B976-DEC021324A3E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/external/android-tools b/external/android-tools deleted file mode 160000 index 260622579..000000000 --- a/external/android-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 260622579ed5755def0558e46c154320ecbcc866 diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools new file mode 160000 index 000000000..137ad817f --- /dev/null +++ b/external/xamarin-android-tools @@ -0,0 +1 @@ +Subproject commit 137ad817f94cc23daa6241668dfa71c4b1213fe7 diff --git a/tools/generator/generator.slnf b/tools/generator/generator.slnf index 7e5e352e4..cef077108 100644 --- a/tools/generator/generator.slnf +++ b/tools/generator/generator.slnf @@ -2,7 +2,7 @@ "solution": { "path": "..\\..\\Java.Interop.sln", "projects": [ - "external\\android-tools\\src\\Xamarin.Android.Tools.AndroidSdk\\Xamarin.Android.Tools.AndroidSdk.csproj", + "external\\xamarin-android-tools\\src\\Xamarin.Android.Tools.AndroidSdk\\Xamarin.Android.Tools.AndroidSdk.csproj", "src\\Java.Interop.Localization\\Java.Interop.Localization.csproj", "src\\Java.Interop.Tools.Cecil\\Java.Interop.Tools.Cecil.csproj", "src\\Java.Interop.Tools.Diagnostics\\Java.Interop.Tools.Diagnostics.csproj",