Skip to content

Bump to jonpryor/Java.Interop/jonp-make-java-interop-optional@90e69226 #5763

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

Closed
wants to merge 1 commit into from
Closed

Bump to jonpryor/Java.Interop/jonp-make-java-interop-optional@90e69226 #5763

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: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated 52 files
+1 −0 Directory.Build.props
+7 −0 Java.Interop.sln
+5 −1 build-tools/automation/azure-pipelines.yaml
+24 −0 build-tools/automation/templates/core-tests.yaml
+100 −49 build-tools/jnienv-gen/Generator.cs
+24 −0 build-tools/scripts/NativeToolchain.targets
+73 −0 build-tools/scripts/RunCmake.proj
+1 −1 external/xamarin-android-tools
+6 −1 src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
+1 −0 src/Java.Interop.Localization/Java.Interop.Localization.csproj
+3 −0 src/Java.Interop/Java.Interop/JavaArray.cs
+18 −0 src/Java.Interop/Java.Interop/JniEnvironment.Types.cs
+1 −1 src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
+1 −1 src/Java.Interop/Java.Interop/JniType.cs
+25 −57 src/Java.Runtime.Environment/Java.Interop/JreRuntime.cs
+228 −0 src/Java.Runtime.Environment/Java.Interop/ManagedObjectReferenceManager.cs
+237 −0 src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
+11 −11 src/Java.Runtime.Environment/Java.Interop/MonoRuntimeObjectReferenceManager.cs
+18 −6 src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
+3 −0 src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
+1 −1 src/Xamarin.Android.Tools.Bytecode/ClassFile.cs
+34 −14 src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs
+3 −0 src/Xamarin.Android.Tools.Bytecode/Methods.cs
+7 −6 src/Xamarin.Android.Tools.Bytecode/XmlClassDeclarationBuilder.cs
+61 −0 src/java-interop/CMakeLists.txt
+101 −0 src/java-interop/Directory.Build.targets
+15 −18 src/java-interop/java-interop-dlfcn.cc
+3 −3 src/java-interop/java-interop-gc-bridge-mono.cc
+17 −5 src/java-interop/java-interop-logger.cc
+3 −3 src/java-interop/java-interop-util.cc
+2 −2 src/java-interop/java-interop-util.h
+5 −0 src/java-interop/java-interop.cc
+0 −37 src/java-interop/java-interop.csproj
+0 −106 src/java-interop/java-interop.targets
+12 −0 tests/Java.Interop-PerformanceTests/Directory.Build.targets
+2 −7 tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj
+8 −0 tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+6 −0 tests/Java.Interop-Tests/Java.Interop/JavaObjectTest.cs
+2 −0 tests/Java.Interop-Tests/Java.Interop/JavaVMFixture.cs
+1 −1 tests/Java.Interop-Tests/Java.Interop/JniValueMarshalerContractTests.cs
+8 −4 tests/Java.Interop-Tests/Java.Interop/TestType.cs
+13 −4 tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs
+11 −0 tests/NativeTiming/CMakeLists.txt
+83 −0 tests/NativeTiming/Directory.Build.targets
+0 −36 tests/NativeTiming/NativeTiming.cproj
+11 −0 tests/NativeTiming/NativeTiming.csproj
+10 −1 tests/NativeTiming/timing.c
+17 −2 tests/TestJVM/TestJVM.cs
+12 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs
+22 −0 tests/generator-Tests/Unit-Tests/XmlApiImporterTests.cs
+10 −5 tools/generator/Java.Interop.Tools.Generator.Importers/XmlApiImporter.cs
+1 −1 tools/param-name-importer/JavaStubSourceImporter.cs
2 changes: 1 addition & 1 deletion src/monodroid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down