From 2ee200369ac9644cfb9d88a22dcb1225cccd6817 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 22 Mar 2021 13:13:27 -0400 Subject: [PATCH] Bump to jonpryor/Java.Interop/jonp-make-java-interop-optional@90e69226 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Context: https://github.com/xamarin/java.interop/pull/820 Context: https://github.com/xamarin/xamarin-android/pull/5757 Does It Build™? --- .gitmodules | 4 ++-- Xamarin.Android.sln | 7 +++++++ external/Java.Interop | 2 +- src/monodroid/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 03f994fd0a8..987d7fbccd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,8 +12,8 @@ branch = master [submodule "external/Java.Interop"] path = external/Java.Interop - url = https://github.com/xamarin/java.interop.git - branch = master + url = https://github.com/jonpryor/java.interop.git + branch = jonp-make-java-interop-optional [submodule "external/lz4"] path = external/lz4 url = https://github.com/lz4/lz4.git diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 9c2f4ad390f..1b9c6bf92d6 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -132,6 +132,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnienv-gen", "external\Java EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "check-boot-times", "build-tools\check-boot-times\check-boot-times.csproj", "{D28957BF-5E66-4D60-B528-22820C60AC82}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "java-interop", "external\Java.Interop\src\java-interop\java-interop.csproj", "{1FED3F23-1175-42AA-BE87-EF1E8DB52F8B}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Generator", "external\Java.Interop\src\Java.Interop.Tools.Generator\Java.Interop.Tools.Generator.csproj", "{2CE4CD4B-B7B7-4EAE-A9BE-2699824D6096}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.SourceWriter", "external\Java.Interop\src\Xamarin.SourceWriter\Xamarin.SourceWriter.csproj", "{86A8DEFE-7ABB-4097-9389-C249581E243D}" @@ -396,6 +398,10 @@ Global {1A273ED2-AE84-48E9-9C23-E978C2D0CB34}.Debug|AnyCPU.Build.0 = Debug|anycpu {1A273ED2-AE84-48E9-9C23-E978C2D0CB34}.Release|AnyCPU.ActiveCfg = Release|anycpu {1A273ED2-AE84-48E9-9C23-E978C2D0CB34}.Release|AnyCPU.Build.0 = Release|anycpu + {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B}.Release|AnyCPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -462,6 +468,7 @@ Global {37FCD325-1077-4603-98E7-4509CAD648D6} = {864062D3-A415-4A6F-9324-5820237BA058} {88B746FF-8D6E-464D-9D66-FF2ECCF148E0} = {864062D3-A415-4A6F-9324-5820237BA058} {1A273ED2-AE84-48E9-9C23-E978C2D0CB34} = {864062D3-A415-4A6F-9324-5820237BA058} + {1FED3F23-1175-42AA-BE87-EF1E8DB52F8B} = {04E3E11E-B47D-4599-8AFC-50515A95E715} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6} diff --git a/external/Java.Interop b/external/Java.Interop index bba1f077ae9..90e69226726 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit bba1f077ae9886cdcc3e35fee35386937ce885dc +Subproject commit 90e692267262c204c90c4321a03df06b3a2773be diff --git a/src/monodroid/CMakeLists.txt b/src/monodroid/CMakeLists.txt index 098be145a84..ccd90c2a581 100644 --- a/src/monodroid/CMakeLists.txt +++ b/src/monodroid/CMakeLists.txt @@ -294,7 +294,7 @@ if(NOT ANDROID) endif() if(WIN32 OR MINGW) - add_compile_definitions(WINDOWS NTDDI_VERSION=NTDDI_VISTA _WIN32_WINNT=_WIN32_WINNT_VISTA) + add_compile_definitions(WINDOWS NTDDI_VERSION=NTDDI_VISTA _WINDOWS _WIN32_WINNT=_WIN32_WINNT_VISTA) endif() # Compiler and linker flags