Skip to content

Remove $(AndroidGenerateJniMarshalMethods) support #11135

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

Draft
jonathanpeppers wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −17
Draft

Remove $(AndroidGenerateJniMarshalMethods) support #11135

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
14 changes: 0 additions & 14 deletions Xamarin.Android.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{04E3E11E-B
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop", "external\Java.Interop\src\Java.Interop\Java.Interop.csproj", "{94BD81F7-B06F-4295-9636-F8A3B6BDC762}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Export", "external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj", "{B501D075-6183-4E1D-92C9-F7B5002475B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generator", "external\Java.Interop\tools\generator\generator.csproj", "{D14A1B5C-2060-4930-92BE-F7190256C735}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.NamingCustomAttributes", "src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.shproj", "{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}"
Expand All @@ -35,8 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{864062D3
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jcw-gen", "external\Java.Interop\tools\jcw-gen\jcw-gen.csproj", "{52C7D9B6-E8C8-47D0-9471-652D278D7D77}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.JniMarshalMethodGenerator", "external\Java.Interop\tools\jnimarshalmethod-gen\Xamarin.Android.Tools.JniMarshalMethodGenerator.csproj", "{D1295A8F-4F42-461D-A046-564476C10002}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaCallableWrappers", "external\Java.Interop\src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj", "{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.ApiXmlAdjuster", "external\Java.Interop\src\Xamarin.Android.Tools.ApiXmlAdjuster\Xamarin.Android.Tools.ApiXmlAdjuster.csproj", "{1268EADF-8344-431C-81F6-FCB7CBC99F49}"
Expand Down Expand Up @@ -165,10 +161,6 @@ Global
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{94BD81F7-B06F-4295-9636-F8A3B6BDC762}.Release|AnyCPU.Build.0 = Release|Any CPU
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{B501D075-6183-4E1D-92C9-F7B5002475B1}.Release|AnyCPU.Build.0 = Release|Any CPU
{D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{D14A1B5C-2060-4930-92BE-F7190256C735}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{D14A1B5C-2060-4930-92BE-F7190256C735}.Release|AnyCPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -197,10 +189,6 @@ Global
{52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{52C7D9B6-E8C8-47D0-9471-652D278D7D77}.Release|AnyCPU.Build.0 = Release|Any CPU
{D1295A8F-4F42-461D-A046-564476C10002}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{D1295A8F-4F42-461D-A046-564476C10002}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{D1295A8F-4F42-461D-A046-564476C10002}.Release|AnyCPU.ActiveCfg = Release|Any CPU
{D1295A8F-4F42-461D-A046-564476C10002}.Release|AnyCPU.Build.0 = Release|Any CPU
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -410,14 +398,12 @@ Global
{AFB8F6D1-6EA9-42C3-950B-98F34C669AD2} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{3FC3E78B-F7D4-42EA-BBE8-4535DF42BFF8} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
{94BD81F7-B06F-4295-9636-F8A3B6BDC762} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{B501D075-6183-4E1D-92C9-F7B5002475B1} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{D14A1B5C-2060-4930-92BE-F7190256C735} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{D27AD8F7-7710-40BE-B03B-55EFBEC13C44} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
{52C7D9B6-E8C8-47D0-9471-652D278D7D77} = {864062D3-A415-4A6F-9324-5820237BA058}
{D1295A8F-4F42-461D-A046-564476C10002} = {864062D3-A415-4A6F-9324-5820237BA058}
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A} = {864062D3-A415-4A6F-9324-5820237BA058}
{1268EADF-8344-431C-81F6-FCB7CBC99F49} = {864062D3-A415-4A6F-9324-5820237BA058}
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A} = {864062D3-A415-4A6F-9324-5820237BA058}
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated 44 files
+1 −37 Java.Interop.sln
+0 −26 Makefile
+0 −43 build-tools/automation/templates/core-tests.yaml
+0 −5 samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.csproj
+0 −25 samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.targets
+0 −1 samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs
+0 −5 samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.csproj
+0 −24 samples/Hello-NativeAOTFromJNI/Hello-NativeAOTFromJNI.targets
+32 −0 samples/Hello-NativeAOTFromJNI/JavaCallableAttributes.cs
+0 −1 samples/Hello-NativeAOTFromJNI/JavaInteropRuntime.cs
+0 −25 src/Java.Interop.Export/Java.Interop.Export.csproj
+0 −545 src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs
+0 −27 src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions.csproj
+0 −828 src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/CecilCompilerExpressionVisitor.cs
+0 −443 src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/ExpressionAssemblyBuilder.cs
+0 −9 src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/ExpressionMethodRegistration.cs
+0 −1 src/Java.Interop/GlobalSuppressions.cs
+10 −164 src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
+0 −3 src/Java.Interop/Java.Interop/JniRuntime.cs
+3 −104 src/Java.Runtime.Environment/Java.Interop/JreTypeManager.cs
+0 −10 src/Java.Runtime.Environment/Java.Interop/ManagedValueManager.cs
+4 −2 src/Java.Runtime.Environment/Java.Interop/MonoRuntimeValueManager.cs
+0 −1 src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
+0 −19 tests/Java.Interop-Tests/Java.Interop/JniRuntimeTest.cs
+4 −4 tests/Java.Interop-Tests/Java.Interop/TestType.cs
+0 −41 tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.csproj
+0 −53 tests/Java.Interop.Export-Tests/Java.Interop.Export-Tests.targets
+0 −286 tests/Java.Interop.Export-Tests/Java.Interop/ExportTest.cs
+0 −36 tests/Java.Interop.Export-Tests/Java.Interop/JavaCallableExample.cs
+0 −27 tests/Java.Interop.Export-Tests/Java.Interop/JavaCallableExampleTests.cs
+0 −29 tests/Java.Interop.Export-Tests/Java.Interop/JavaVMFixture.cs
+0 −570 tests/Java.Interop.Export-Tests/Java.Interop/MarshalMemberBuilderTest.cs
+0 −162 tests/Java.Interop.Export-Tests/java/net/dot/jni/test/ExportType.java
+0 −11 tests/Java.Interop.Export-Tests/java/net/dot/jni/test/UseJavaCallableExample.java
+0 −33 tests/Java.Interop.Tools.Expressions-Tests/Java.Interop.Tools.Expressions-Tests.csproj
+0 −444 .../Java.Interop.Tools.Expressions-Tests/Java.Interop.Tools.ExpressionsTests/ExpressionAssemblyBuilderTests.cs
+0 −1 tests/Java.Interop.Tools.Expressions-Tests/Usings.cs
+0 −2 tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
+0 −0 tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop/JavaCallableAttribute.cs
+0 −0 tests/Java.Interop.Tools.JavaCallableWrappers-Tests/Java.Interop/JavaCallableConstructorAttribute.cs
+0 −848 tools/jnimarshalmethod-gen/App.cs
+0 −29 tools/jnimarshalmethod-gen/Message.cs
+0 −549 tools/jnimarshalmethod-gen/TypeMover.cs
+0 −40 tools/jnimarshalmethod-gen/Xamarin.Android.Tools.JniMarshalMethodGenerator.csproj
1 change: 0 additions & 1 deletion src/Microsoft.Android.Runtime.NativeAOT/Android.Runtime.NativeAOT/JavaInteropRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ static void init (IntPtr jnienv, IntPtr klass, IntPtr classLoader, IntPtr langua
ClassLoader = new JniObjectReference (classLoader, JniObjectReferenceType.Global),
TypeManager = typeManager,
ValueManager = new JavaMarshalValueManager (),
UseMarshalMemberBuilder = false,
JniGlobalReferenceLogWriter = settings.GrefLog,
JniLocalReferenceLogWriter = settings.LrefLog,
};
Expand Down
1 change: 0 additions & 1 deletion src/Mono.Android/Android.Runtime/AndroidRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ public AndroidRuntimeOptions (IntPtr jnienv,
ObjectReferenceManager = new AndroidObjectReferenceManager ();
TypeManager = typeManager;
ValueManager = valueManager;
UseMarshalMemberBuilder = false;
JniAddNativeMethodRegistrationAttributePresent = jniAddNativeMethodRegistrationAttributePresent;
}
}
Expand Down
Loading