diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 36818352a..eb83eb26b 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -35,7 +35,6 @@
### Core Libraries (`src/`)
- **`Java.Interop/`**: Main JNI binding library with core types and runtime
- **`Java.Interop.Export/`**: `[Export]` attribute support for exposing managed methods to Java
-- **`Java.Runtime.Environment/`**: JVM loading and lifecycle management
- **`Java.Base/`**: Bindings for core Java types (`java.lang.*`, etc.)
### Code Generation Tools (`tools/`)
@@ -52,13 +51,11 @@
- **`Xamarin.SourceWriter/`**: Code generation utilities
### Testing (`tests/`)
-- Unit tests for all major components
-- Integration tests with real JVM instances
+- Unit tests for the core JNI binding and code-generation components
+- Integration tests with real JVM instances where needed
- Generator tests with sample API descriptions
### Samples (`samples/`)
-- **`Hello-Core/`**: Minimal JNI usage without object mapping
-- **`Hello-Java.Base/`**: Using core Java type bindings
- **`Hello-NativeAOT*/`**: Ahead-of-time compilation scenarios
## Development Patterns & Conventions
@@ -133,7 +130,7 @@ dotnet build -t:Prepare
dotnet build
# Run specific tests
-dotnet test tests/Java.Interop-Tests/Java.Interop-Tests.csproj
+dotnet test tests/Java.Interop.Tools.Generator-Tests/Java.Interop.Tools.Generator-Tests.csproj
# Build with specific configuration
dotnet build -c Release
diff --git a/Documentation/BuildConfiguration.md b/Documentation/BuildConfiguration.md
index 3cff9e86e..13984d292 100644
--- a/Documentation/BuildConfiguration.md
+++ b/Documentation/BuildConfiguration.md
@@ -17,10 +17,9 @@ Overridable MSBuild properties include:
* `$(CecilSourceDirectory)`: If the empty string, Cecil will be obtained from
NuGet packages. Otherwise, `$(UtilityOutputFullPath)Xamarin.Android.Cecil.dll`
will be used to reference Cecil.
-* `$(JdkJvmPath)`: Full path name to the JVM native library to link
- [`java-interop`](src/java-interop) against. By default this is
- probed for from numerous locations within
- [`build-tools/scripts/jdk.mk`](build-tools/scripts/jdk.mk).
+* `$(JdkJvmPath)`: Full path name to the JVM native library to use for
+ tests which require a desktop JVM. By default this is probed from the
+ configured JDK.
* `$(JavaCPath)`: Path to the `javac` command-line tool, by default set to `javac`.
* `$(JarPath)`: Path to the `jar` command-line tool, by default set to `jar`.
* It may be desirable to override these on Windows, depending on your `PATH`.
diff --git a/Java.Interop.sln b/Java.Interop.sln
index 7fb468cc9..06bff52de 100644
--- a/Java.Interop.sln
+++ b/Java.Interop.sln
@@ -1,4 +1,4 @@
-
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29424.173
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaSour
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{0998E45F-8BCE-4791-A944-962CD54E2D80}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Runtime.Environment", "src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{5887B410-D448-4257-A46B-EAC03C80BE93}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.Bytecode", "src\Xamarin.Android.Tools.Bytecode\Xamarin.Android.Tools.Bytecode.csproj", "{B17475BC-45A2-47A3-B8FC-62F3A0959EE0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.AnnotationSupport", "src\Xamarin.Android.Tools.AnnotationSupport\Xamarin.Android.Tools.AnnotationSupport.csproj", "{07BC4495-1267-4B78-9EA6-B76FEEA2A64A}"
@@ -45,12 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.ApiXm
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generator-Tests", "tests\generator-Tests\generator-Tests.csproj", "{4EEAB1A7-99C1-4302-9C18-01A7B481409B}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D5A93398-AEB1-49F3-89DC-3904A47DB0C7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hello-Java.Base", "samples\Hello-Java.Base\Hello-Java.Base.csproj", "{F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hello-Core", "samples\Hello-Core\Hello-Core.csproj", "{0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build-Tools", "Build-Tools", "{172B608B-E6F3-41CC-9949-203A76BA247C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jnienv-gen", "build-tools\jnienv-gen\jnienv-gen.csproj", "{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}"
@@ -83,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.SourceWriter-Tests"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Localization", "src\Java.Interop.Localization\Java.Interop.Localization.csproj", "{998D178B-F4C7-48B5-BDEE-44E2F869BB22}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "invocation-overhead", "tests\invocation-overhead\invocation-overhead.csproj", "{3CF58D34-693C-408A-BFE7-BC5E4BE44A26}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeTiming", "tests\NativeTiming\NativeTiming.csproj", "{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaTypeSystem", "src\Java.Interop.Tools.JavaTypeSystem\Java.Interop.Tools.JavaTypeSystem.csproj", "{B173F53B-986C-4E0D-881C-063BBB116E1D}"
@@ -93,23 +83,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaType
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Base", "src\Java.Base\Java.Base.csproj", "{30DCECA5-16FD-4FD0-883C-E5E83B11565D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Base-Tests", "tests\Java.Base-Tests\Java.Base-Tests.csproj", "{CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Maven", "src\Java.Interop.Tools.Maven\Java.Interop.Tools.Maven.csproj", "{DA458F90-218B-4FE3-995F-AF4B27895FA2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.Maven-Tests", "tests\Java.Interop.Tools.Maven-Tests\Java.Interop.Tools.Maven-Tests.csproj", "{6BC04C7F-949E-4F93-BF1F-E3B1DF0B888D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello-NativeAOTFromJNI", "samples\Hello-NativeAOTFromJNI\Hello-NativeAOTFromJNI.csproj", "{8DB3842B-73D7-491C-96F9-EBC863E2C917}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40B3CE2F-B8DE-45CD-A43A-0F1A89BDB803}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.TypeNameMappings", "src\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.csproj", "{C2AF6ACF-04F6-4B41-95EA-97A372C075F9}"
EndProject
Global
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 5
- src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d18fcf91-8876-48a0-a693-2dc1e7d3d80a}*SharedItemsImports = 5
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
@@ -139,10 +121,6 @@ Global
{5C0B3562-8DA0-4726-9762-75B9709ED6B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C0B3562-8DA0-4726-9762-75B9709ED6B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C0B3562-8DA0-4726-9762-75B9709ED6B7}.Release|Any CPU.Build.0 = Release|Any CPU
- {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5887B410-D448-4257-A46B-EAC03C80BE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5887B410-D448-4257-A46B-EAC03C80BE93}.Release|Any CPU.Build.0 = Release|Any CPU
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -183,14 +161,6 @@ Global
{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EEAB1A7-99C1-4302-9C18-01A7B481409B}.Release|Any CPU.Build.0 = Release|Any CPU
- {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9}.Release|Any CPU.Build.0 = Release|Any CPU
- {0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461}.Release|Any CPU.Build.0 = Release|Any CPU
{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -251,10 +221,6 @@ Global
{998D178B-F4C7-48B5-BDEE-44E2F869BB22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{998D178B-F4C7-48B5-BDEE-44E2F869BB22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{998D178B-F4C7-48B5-BDEE-44E2F869BB22}.Release|Any CPU.Build.0 = Release|Any CPU
- {3CF58D34-693C-408A-BFE7-BC5E4BE44A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3CF58D34-693C-408A-BFE7-BC5E4BE44A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3CF58D34-693C-408A-BFE7-BC5E4BE44A26}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3CF58D34-693C-408A-BFE7-BC5E4BE44A26}.Release|Any CPU.Build.0 = Release|Any CPU
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -271,10 +237,6 @@ Global
{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30DCECA5-16FD-4FD0-883C-E5E83B11565D}.Release|Any CPU.Build.0 = Release|Any CPU
- {CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC}.Release|Any CPU.Build.0 = Release|Any CPU
{DA458F90-218B-4FE3-995F-AF4B27895FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA458F90-218B-4FE3-995F-AF4B27895FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA458F90-218B-4FE3-995F-AF4B27895FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -283,10 +245,6 @@ Global
{6BC04C7F-949E-4F93-BF1F-E3B1DF0B888D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BC04C7F-949E-4F93-BF1F-E3B1DF0B888D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BC04C7F-949E-4F93-BF1F-E3B1DF0B888D}.Release|Any CPU.Build.0 = Release|Any CPU
- {8DB3842B-73D7-491C-96F9-EBC863E2C917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8DB3842B-73D7-491C-96F9-EBC863E2C917}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8DB3842B-73D7-491C-96F9-EBC863E2C917}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8DB3842B-73D7-491C-96F9-EBC863E2C917}.Release|Any CPU.Build.0 = Release|Any CPU
{C2AF6ACF-04F6-4B41-95EA-97A372C075F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C2AF6ACF-04F6-4B41-95EA-97A372C075F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C2AF6ACF-04F6-4B41-95EA-97A372C075F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -302,7 +260,6 @@ Global
{94BD81F7-B06F-4295-9636-F8A3B6BDC762} = {4C173212-371D-45D8-BA83-9226194F48DC}
{BB0AB9F7-0979-41A7-B7A9-877260655F94} = {4C173212-371D-45D8-BA83-9226194F48DC}
{5C0B3562-8DA0-4726-9762-75B9709ED6B7} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
- {5887B410-D448-4257-A46B-EAC03C80BE93} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{1268EADF-8344-431C-81F6-FCB7CBC99F49} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
@@ -313,8 +270,6 @@ Global
{C9FA4492-DEB0-4932-A6B8-E2C4E0581692} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{891F2E04-5614-4A26-A78F-3778025ECF43} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{4EEAB1A7-99C1-4302-9C18-01A7B481409B} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
- {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9} = {D5A93398-AEB1-49F3-89DC-3904A47DB0C7}
- {0E6DE9F9-35B1-4DFB-BB8B-7E4A2D362461} = {D5A93398-AEB1-49F3-89DC-3904A47DB0C7}
{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A} = {172B608B-E6F3-41CC-9949-203A76BA247C}
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
@@ -330,18 +285,19 @@ Global
{C5B732C8-7AF3-41D3-B903-AEDFC392E5BA} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{6CF94627-BA74-4336-88CD-7EDA20C8F292} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{998D178B-F4C7-48B5-BDEE-44E2F869BB22} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
- {3CF58D34-693C-408A-BFE7-BC5E4BE44A26} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{B173F53B-986C-4E0D-881C-063BBB116E1D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{11942DE9-AEC2-4B95-87AB-CA707C37643D} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{30DCECA5-16FD-4FD0-883C-E5E83B11565D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
- {CB05E11B-B96F-4179-A4E9-5D6BDE29A8FC} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{DA458F90-218B-4FE3-995F-AF4B27895FA2} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{6BC04C7F-949E-4F93-BF1F-E3B1DF0B888D} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
- {8DB3842B-73D7-491C-96F9-EBC863E2C917} = {D5A93398-AEB1-49F3-89DC-3904A47DB0C7}
{C2AF6ACF-04F6-4B41-95EA-97A372C075F9} = {40B3CE2F-B8DE-45CD-A43A-0F1A89BDB803}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5}
EndGlobalSection
+ GlobalSection(SharedMSBuildProjectFiles) = preSolution
+ src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 5
+ src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{d18fcf91-8876-48a0-a693-2dc1e7d3d80a}*SharedItemsImports = 5
+ EndGlobalSection
EndGlobal
diff --git a/Makefile b/Makefile
index ddf68c88f..d8ede4a32 100644
--- a/Makefile
+++ b/Makefile
@@ -15,33 +15,29 @@ endif
PREPARE_EXTERNAL_FILES = \
external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj
-DEPENDENCIES = \
- bin/Test$(CONFIGURATION)/libNativeTiming$(NATIVE_EXT)
-
-NET_SUFFIX = -net7.0
-
-TESTS = \
- bin/Test$(CONFIGURATION)/Java.Interop-Tests.dll \
- bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \
- bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaSource-Tests.dll \
- bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \
- bin/Test$(CONFIGURATION)/generator-Tests.dll \
- bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
- bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaTypeSystem-Tests.dll \
- bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.Bytecode-Tests.dll \
- bin/Test$(CONFIGURATION)/Java.Interop.Tools.Generator-Tests.dll \
- bin/Test$(CONFIGURATION)/Xamarin.SourceWriter-Tests.dll
+DEPENDENCIES =
-NET_TESTS = \
- bin/Test$(CONFIGURATION)$(NET_SUFFIX)/Java.Base-Tests.dll
-
-PTESTS = \
- bin/Test$(CONFIGURATION)/Java.Interop-PerformanceTests.dll
+NET_SUFFIX = -net10.0
+TEST_OUTPUT = bin/Test$(CONFIGURATION)$(NET_SUFFIX)
-ATESTS = \
- bin/Test$(CONFIGURATION)/Android.Interop-Tests.dll
+TESTS =
-all: $(DEPENDENCIES) $(TESTS)
+NET_TESTS = \
+ $(TEST_OUTPUT)/Java.Interop-Tests.dll \
+ $(TEST_OUTPUT)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \
+ $(TEST_OUTPUT)/Java.Interop.Tools.JavaSource-Tests.dll \
+ $(TEST_OUTPUT)/Java.Interop.Tools.Maven-Tests.dll \
+ $(TEST_OUTPUT)/Java.Interop.Tools.JavaTypeSystem-Tests.dll \
+ $(TEST_OUTPUT)/Java.Interop.Tools.Generator-Tests.dll \
+ $(TEST_OUTPUT)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \
+ $(TEST_OUTPUT)/Xamarin.Android.Tools.Bytecode-Tests.dll \
+ $(TEST_OUTPUT)/Xamarin.SourceWriter-Tests.dll \
+ $(TEST_OUTPUT)/generator-Tests.dll \
+ $(TEST_OUTPUT)/logcat-parse-Tests.dll
+
+PTESTS =
+
+all: $(DEPENDENCIES) $(TESTS) $(NET_TESTS)
bin/ilverify:
-mkdir bin
@@ -50,7 +46,6 @@ bin/ilverify:
run-all-tests:
r=0; \
$(MAKE) run-tests || r=1 ; \
- $(MAKE) run-test-jnimarshal || r=1 ; \
$(MAKE) run-net-tests || r=1 ; \
$(MAKE) run-ptests || r=1 ; \
$(MAKE) run-java-source-utils-tests || r=1 ; \
@@ -72,38 +67,29 @@ include build-tools/scripts/mono.mk
-include bin/Build$(CONFIGURATION)/mono.mk
-include bin/Build$(CONFIGURATION)/JdkInfo.mk
-JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE = Java.Runtime.Environment.Override.dllmap
-ifeq ($(wildcard $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE)),)
- JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD = '/@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@/d'
-else
- JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE_CMD = '/@JAVA_RUNTIME_ENVIRONMENT_DLLMAP@/ {' -e 'r $(JAVA_RUNTIME_ENVIRONMENT_DLLMAP_OVERRIDE)' -e 'd' -e '}'
-endif
-
-JAVA_INTEROP_LIB = libjava-interop$(NATIVE_EXT)
NATIVE_TIMING_LIB = libNativeTiming$(NATIVE_EXT)
bin/Test$(CONFIGURATION)/$(NATIVE_TIMING_LIB): tests/NativeTiming/timing.c $(wildcard $(JI_JDK_INCLUDE_PATHS)/jni.h)
mkdir -p `dirname "$@"`
gcc -g -shared -m64 -fPIC -o $@ $< $(JI_JDK_INCLUDE_PATHS:%=-I%)
-# Usage: $(call TestAssemblyTemplate,assembly-basename)
define TestAssemblyTemplate
-bin/Test$$(CONFIGURATION)/$(1)-Tests.dll: $(wildcard src/$(1)/*/*.cs src/$(1)/Test*/*/*.cs)
+$(TEST_OUTPUT)/$(1)-Tests.dll: tests/$(1)-Tests/$(1)-Tests.csproj
$$(MSBUILD) $$(MSBUILD_FLAGS)
touch $$@
-endef # TestAssemblyTemplate
+endef
$(eval $(call TestAssemblyTemplate,Java.Interop))
-$(eval $(call TestAssemblyTemplate,Java.Interop.Export))
$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.JavaCallableWrappers))
-
-bin/Test$(CONFIGURATION)/Java.Interop-PerformanceTests.dll: $(wildcard tests/Java.Interop-PerformanceTests/*.cs) bin/Test$(CONFIGURATION)/$(NATIVE_TIMING_LIB)
- $(MSBUILD) $(MSBUILD_FLAGS)
- touch $@
-
-bin/Test$(CONFIGURATION)/Android.Interop-Tests.dll: $(wildcard src/Android.Interop/*/*.cs src/Android.Interop/Tests/*/*.cs)
- $(MSBUILD) $(MSBUILD_FLAGS)
- touch $@
+$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.JavaSource))
+$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.Maven))
+$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.JavaTypeSystem))
+$(eval $(call TestAssemblyTemplate,Java.Interop.Tools.Generator))
+$(eval $(call TestAssemblyTemplate,Xamarin.Android.Tools.ApiXmlAdjuster))
+$(eval $(call TestAssemblyTemplate,Xamarin.Android.Tools.Bytecode))
+$(eval $(call TestAssemblyTemplate,Xamarin.SourceWriter))
+$(eval $(call TestAssemblyTemplate,generator))
+$(eval $(call TestAssemblyTemplate,logcat-parse))
bin/$(CONFIGURATION)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/Java.Interop/Java.Interop.csproj
$(MSBUILD) $(if $(V),/v:diag,) /p:Configuration=$(CONFIGURATION) $(if $(SNK),"/p:AssemblyOriginatorKeyFile=$(SNK)",)
@@ -111,8 +97,6 @@ bin/$(CONFIGURATION)/Java.Interop.dll: $(wildcard src/Java.Interop/*/*.cs) src/J
CSHARP_REFS = \
bin/$(CONFIGURATION)/Java.Interop.dll \
bin/$(CONFIGURATION)/Java.Interop.Export.dll \
- bin/$(CONFIGURATION)/Java.Runtime.Environment.dll \
- bin/Test$(CONFIGURATION)/TestJVM.dll \
$(PTESTS) \
$(TESTS)
@@ -125,17 +109,17 @@ define RUN_TEST
$(MSBUILD) $(MSBUILD_FLAGS) build-tools/scripts/RunNUnitTests.targets /p:TestAssembly=$(1) || r=1;
endef
-run-tests: $(TESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
+run-tests: $(TESTS)
r=0; \
$(foreach t,$(TESTS), $(call RUN_TEST,$(t),1)) \
exit $$r;
-run-net-tests: $(NET_TESTS) bin/Test$(CONFIGURATION)$(NET_SUFFIX)/$(JAVA_INTEROP_LIB)
+run-net-tests: $(NET_TESTS)
r=0; \
- $(foreach t,$(NET_TESTS), dotnet test $(t) || r=1) \
+ $(foreach t,$(NET_TESTS), dotnet test $(t) || r=1;) \
exit $$r;
-run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
+run-ptests: $(PTESTS)
r=0; \
$(foreach t,$(PTESTS), $(call RUN_TEST,$(t))) \
exit $$r;
@@ -143,14 +127,6 @@ run-ptests: $(PTESTS) bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
run-java-source-utils-tests:
$(MSBUILD) $(MSBUILD_FLAGS) tools/java-source-utils/java-source-utils.csproj /t:RunTests
-bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB): bin/$(CONFIGURATION)/$(JAVA_INTEROP_LIB)
- cp $< $@
-
-JRE_DLL_CONFIG=bin/$(CONFIGURATION)/Java.Runtime.Environment.dll.config
-
-$(JRE_DLL_CONFIG): src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
- $(MSBUILD) $(MSBUILD_FLAGS) $<
-
bin/Test$(CONFIGURATION)/generator.exe: bin/$(CONFIGURATION)/generator.exe
cp $<* `dirname "$@"`
diff --git a/build-tools/automation/templates/core-tests.yaml b/build-tools/automation/templates/core-tests.yaml
index d736d80ea..34f399b12 100644
--- a/build-tools/automation/templates/core-tests.yaml
+++ b/build-tools/automation/templates/core-tests.yaml
@@ -62,13 +62,6 @@ steps:
condition: or(eq('${{ parameters.runNativeDotnetTests }}', 'true'), eq('${{ parameters.runNativeTests }}', 'true'))
retryCount: 1
-- template: run-dotnet-test.yaml
- parameters:
- testRunTitle: Java.Base ($(DotNetTargetFramework) - ${{ parameters.platformName }})
- testAssemblyName: Java.Base-Tests
- condition: or(eq('${{ parameters.runNativeDotnetTests }}', 'true'), eq('${{ parameters.runNativeTests }}', 'true'))
- retryCount: 1
-
- task: DotNetCoreCLI@2
displayName: 'Tests: java-source-utils'
inputs:
diff --git a/samples/Hello-Core/Hello-Core.csproj b/samples/Hello-Core/Hello-Core.csproj
deleted file mode 100644
index c490735a9..000000000
--- a/samples/Hello-Core/Hello-Core.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- $(DotNetTargetFramework)
- Exe
- Hello
- enable
- enable
- true
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Hello-Core/Program.cs b/samples/Hello-Core/Program.cs
deleted file mode 100644
index 157aa80b2..000000000
--- a/samples/Hello-Core/Program.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using Java.Interop;
-
-using Mono.Options;
-
-bool showHelp = false;
-
-var jreOptions = new JreRuntimeOptions {
-};
-
-var options = new OptionSet {
- "Using the JVM from C#!",
- "",
- "Options:",
- { "jvm=",
- $"{{PATH}} to JVM to use.",
- v => jreOptions.JvmLibraryPath = v },
- { "cp=|classpath",
- $"Add {{JAR-OR-DIRECTORY}} to JVM classpath.",
- v => jreOptions.ClassPath.Add (v)},
- { "J=",
- $"Pass the specified option to the JVM.",
- v => jreOptions.AddOption (v) },
- { "h|help",
- "Show this message and exit.",
- v => showHelp = v != null },
-};
-options.Parse (args);
-
-if (showHelp) {
- options.WriteOptionDescriptions (Console.Out);
- return;
-}
-
-if (string.IsNullOrEmpty (jreOptions.JvmLibraryPath) || !File.Exists (jreOptions.JvmLibraryPath)) {
- Error ("Option -jvm=PATH is required. PATH is a full path to the JVM native library to use, e.g. `libjli.dylib`.");
- return;
-}
-
-var jre = jreOptions.CreateJreVM ();
-
-// We now have a JVM!
-// The current thread is implicitly attached to the JVM.
-// Access of `JniEnvironment` members on other threads will implicitly attach those threads to the JVM.
-
-//
-// Useful background info: the JNI documentation! https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html
-//
-
-var Object_class = JniEnvironment.Types.FindClass ("java/lang/Object");
-Console.WriteLine ($"Object_class={Object_class}");
-var Object_ctor = JniEnvironment.InstanceMethods.GetMethodID (Object_class, "", "()V");
-var Object_val = JniEnvironment.Object.NewObject (Object_class, Object_ctor);
-
-Console.WriteLine ($"Object_val={Object_val}");
-
-// Invoke `Object.toString()`
-var Object_toString = JniEnvironment.InstanceMethods.GetMethodID (Object_class, "toString", "()Ljava/lang/String;");
-unsafe {
- var Object_desc = JniEnvironment.InstanceMethods.CallObjectMethod (Object_val, Object_toString, null);
- Console.WriteLine ($"Object_val.toString()={JniEnvironment.Strings.ToString (Object_desc)}");
-
- // When JNI returns a `jobject` or `jclass` value, JNI returns a *JNI Object Reference*.
- // The `JniObjectReference` struct is used to store JNI Local, Global, and Weak Global references.
- //
- // When an object reference is no longer required, it should be explicitly deleted.
-
- JniObjectReference.Dispose (ref Object_desc);
-}
-
-JniObjectReference.Dispose (ref Object_class);
-JniObjectReference.Dispose (ref Object_val);
-
-// There are some OO wrappers over the core `JniEnvironment` members. `JniType` is useful.
-var Object_type = new JniType ("java/lang/Object");
-var Object_ctor2 = Object_type.GetConstructor ("()V");
-
-unsafe {
- var Object_val2 = Object_type.NewObject (Object_ctor2, null);
- var Object_desc = JniEnvironment.InstanceMethods.CallObjectMethod (Object_val2, Object_toString, null);
- Console.WriteLine ($"Object_val.toString()={JniEnvironment.Strings.ToString (Object_desc)}");
-}
-
-void Error (string message)
-{
- var app = Path.GetFileNameWithoutExtension (Environment.GetCommandLineArgs ()[0]);
- Console.Error.WriteLine ($"{app}: {message}");
-}
diff --git a/samples/Hello-Core/README.md b/samples/Hello-Core/README.md
deleted file mode 100644
index 30893d6b8..000000000
--- a/samples/Hello-Core/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Hello-Core
-
-Use as little of `Java.Interop.dll` as possible. No object mapping.
-
-Usage:
-
-```
-Options:
- --jvm=PATH PATH to JVM to use.
- --cp, --classpath=JAR-OR-DIRECTORY
- Add JAR-OR-DIRECTORY to JVM classpath.
- -J=VALUE Pass the specified option to the JVM.
- -h, --help Show this message and exit.
-```
-
-`-J` can be used to add runtime options to the JVM instance, e.g.
-
-```shell
-# Enable verbose JNI logging from the JVM
-% dotnet run -- --jvm /Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home/lib/jli/libjli.dylib -J-verbose:jni
-[Dynamic-linking native method java.lang.Object.registerNatives ... JNI]
-[Registering JNI native method java.lang.Object.hashCode]
-[Registering JNI native method java.lang.Object.wait]
-…
-```
-
-The sample will create a `java.lang.Object` instance and invoke `Object.toString()` on it.
-
-```
-% dotnet run -- --jvm /Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home/lib/jli/libjli.dylib
-Object_class=0x7ff04f105b98/L
-Object_val=0x7ff04f105ba8/L
-Object_val.toString()=java.lang.Object@5cbc508c
-Object_val.toString()=java.lang.Object@3419866c
-```
diff --git a/samples/Hello-Java.Base/Hello-Java.Base.csproj b/samples/Hello-Java.Base/Hello-Java.Base.csproj
deleted file mode 100644
index f66c58ab7..000000000
--- a/samples/Hello-Java.Base/Hello-Java.Base.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- $(DotNetTargetFramework)
- Exe
- true
- enable
- Hello.App
-
-
-
-
-
-
-
- $(MSBuildThisFileDirectory)bin\$(Configuration)\
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Hello-Java.Base/Program.cs b/samples/Hello-Java.Base/Program.cs
deleted file mode 100644
index 7b5355e3a..000000000
--- a/samples/Hello-Java.Base/Program.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.IO;
-using System.Threading;
-
-using Mono.Options;
-
-using Java.Interop;
-
-namespace Hello
-{
- class App
- {
- const int N = 1000000;
-
- public static void Main (string[] args)
- {
- var logger = (Action?) null;
- string? jvmPath = null;
- bool createMultipleVMs = false;
- bool reportTiming = false;
- bool showHelp = false;
- int verbosity = 0;
- var options = new OptionSet () {
- "Using the JVM from C#!",
- "",
- "Options:",
- { "jvm=",
- $"{{PATH}} to JVM to use. Default is:\n{Java.InteropTests.TestJVM.GetJvmLibraryPath (logger)}",
- v => jvmPath = v },
- { "m",
- "Create multiple Java VMs. This will likely crash.",
- v => createMultipleVMs = v != null },
- { "t",
- $"Timing; invoke Object.hashCode() {N} times, print average.",
- v => reportTiming = v != null },
- { "v|verbosity:",
- $"Set console log verbosity to {{LEVEL}}. Default is 0.",
- (int? v) => verbosity = v.HasValue ? v.Value : verbosity + 1 },
- { "h|help",
- "Show this message and exit.",
- v => showHelp = v != null },
- };
- options.Parse (args);
- if (showHelp) {
- options.WriteOptionDescriptions (Console.Out);
- return;
- }
- if (verbosity > 0) {
- logger = CreateConsoleLogger ();
- }
- var builder = new JreRuntimeOptions () {
- JniAddNativeMethodRegistrationAttributePresent = true,
- JvmLibraryPath = jvmPath ?? global::Java.InteropTests.TestJVM.GetJvmLibraryPath (logger),
- ClassPath = {
- Path.Combine (Path.GetDirectoryName (typeof (App).Assembly.Location)!, "Hello-Java.Base.jar"),
- },
- TypeMappings = {
- [MyJLO.JniTypeName] = typeof (MyJLO),
- },
- };
- builder.AddOption ("-Xcheck:jni");
-
- var jvm = builder.CreateJreVM ();
-
- if (reportTiming) {
- ReportTiming ();
- return;
- }
-
- if (createMultipleVMs) {
- CreateAnotherJVM ();
- return;
- }
-
- CreateJLO ();
-
- GC.Collect ();
- GC.Collect ();
- GC.WaitForPendingFinalizers ();
- GC.WaitForPendingFinalizers ();
- }
-
- static Action CreateConsoleLogger ()
- {
- return (level, message) => {
- Console.WriteLine ($"# {level}: {message}");
- };
- }
-
- static void CreateJLO ()
- {
- var jlo = new MyJLO ();
- Console.WriteLine ($"binding? {jlo.ToString ()}");
- }
-
- static void ReportTiming ()
- {
- var jlo = new Java.Lang.Object ();
- var t = Stopwatch.StartNew ();
- for (int i = 0; i < N; ++i) {
- jlo.GetHashCode ();
- }
- t.Stop ();
- Console.WriteLine ($"Object.hashCode: {N} invocations. Total={t.Elapsed}; Average={t.Elapsed.TotalMilliseconds / (double) N}ms");
- }
-
- static unsafe void CreateAnotherJVM ()
- {
- Console.WriteLine ("Part 2!");
- using (var vm = new JreRuntimeOptions ().CreateJreVM ()) {
- Console.WriteLine ("# JniEnvironment.EnvironmentPointer={0}", JniEnvironment.EnvironmentPointer);
- Console.WriteLine ("vm.SafeHandle={0}", vm.InvocationPointer);
- var t = new JniType ("java/lang/Object");
- var c = t.GetConstructor ("()V");
- var o = t.NewObject (c, null);
- var m = t.GetInstanceMethod ("hashCode", "()I");
- int i = JniEnvironment.InstanceMethods.CallIntMethod (o, m);
- Console.WriteLine ("java.lang.Object={0}", o);
- Console.WriteLine ("hashcode={0}", i);
- JniObjectReference.Dispose (ref o);
- t.Dispose ();
- // var o = JniTypes.FindClass ("java/lang/Object");
- /*
- var waitForCreation = new CountdownEvent (1);
- var exitThread = new CountdownEvent (1);
- var t = new Thread (() => {
- var vm2 = new JavaVMBuilder ().CreateJavaVM ();
- waitForCreation.Signal ();
- exitThread.Wait ();
- });
- t.Start ();
- waitForCreation.Wait ();
- */
- foreach (var h in vm.GetAvailableInvocationPointers ()) {
- Console.WriteLine ("WITHIN: GetCreatedJavaVMs: {0}", h);
- }
- // exitThread.Signal ();
- }
- foreach (var h in JniRuntime.GetRegisteredRuntimes ()) {
- Console.WriteLine ("POST: GetCreatedJavaVMs: {0}", h);
- }
- }
- }
-
- [JniTypeSignature (JniTypeName)]
- class MyJLO : Java.Lang.Object {
- internal const string JniTypeName = "net/dot/jni/sample/MyJLO";
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/.gitignore b/samples/Hello-NativeAOTFromAndroid/.gitignore
deleted file mode 100644
index 405190315..000000000
--- a/samples/Hello-NativeAOTFromAndroid/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.gradle
-build/
-local.properties
-android.xml.fixed
diff --git a/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.csproj b/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.csproj
deleted file mode 100644
index 5923127ff..000000000
--- a/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- $(DotNetTargetFramework)
-
-
-
-
-
- Java.Interop.Samples.NativeAotFromAndroid
- enable
- enable
- true
- true
- true
- Shared
- linux-bionic-arm64
-
- AnyCPU
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.targets b/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.targets
deleted file mode 100644
index bcf5c5977..000000000
--- a/samples/Hello-NativeAOTFromAndroid/Hello-NativeAOTFromAndroid.targets
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
- $(UtilityOutputFullPath)generator.dll
- <_JcwOutputDir>app/src/main/java/my/
- <_GradleJniLibsDir>app/src/main/jniLibs/arm64-v8a
- $(ANDROID_NDK_HOME)
- $(ANDROID_HOME)
-
-
-
- <_NdkSysrootAbi Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-arm64' ">aarch64-linux-android
- <_NdkClangPrefix Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-arm64' ">aarch64-linux-android21-
- <_NdkSysrootAbi Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-x64' ">x86_64-linux-android
- <_NdkClangPrefix Condition=" '$(RuntimeIdentifier)' == 'linux-bionic-x64' ">x86_64-linux-android21-
- <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('osx')) ">darwin-x86_64
- <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('linux')) ">linux-x86_64
- <_NdkPrebuiltAbi Condition=" $([MSBuild]::IsOSPlatform('windows')) ">windows-x86_64
- <_NdkSysrootLibDir>$(AndroidNdkDirectory)/toolchains/llvm/prebuilt/$(_NdkPrebuiltAbi)/sysroot/usr/lib/$(_NdkSysrootAbi)
- <_NdkBinDir>$(AndroidNdkDirectory)/toolchains/llvm/prebuilt/$(_NdkPrebuiltAbi)/bin
-
-
-
- $(_NdkClangPrefix)clang.cmd
- $(_NdkBinDir)/$(_NdkClangPrefix)clang
- llvm-objcopy.exe
- $(_NdkBinDir)/llvm-objcopy
-
-
-
-
-
-
-
- <_HomeDir Condition=" '$(OS)' != 'Windows_NT' ">$(HOME)/
- <_HomeDir Condition=" '$(OS)' == 'Windows_NT' ">$(HOMEDRIVE)$(HOMEPATH)\
-
-
-
-
-
-
-
- <_DebugKeystorePath>$(_HomeDir).android/debug.keystore
-
-
-
- <_WinNdkBinDir>$(_NdkBinDir.Replace('/', '%5c'))
-
-
-
-
-
- <_GenerateAndroidBindingInputs Include="$(GeneratorPath)" />
- <_GenerateAndroidBindingInputs Include="$(MSBuildThisFileFullPath)" />
- <_GenerateAndroidBindingInputs Include="Transforms\**" />
- <_GenerateAndroidBindingInputs Include="$(IntermediateOutputPath)mcw\api.xml" />
-
-
-
-
-
- "$(GeneratorPath)"
- <_GenFlags>--public --global
- <_Out>-o "$(IntermediateOutputPath)mcw"
- <_Codegen>--codegen-target=JavaInterop1
- <_Fixup>--fixup=Transforms/Metadata.xml
- <_Enums1>--preserve-enums --enumflags=Transforms/enumflags --enumfields=Transforms/map.csv --enummethods=Transforms/methodmap.csv
- <_Enums2>--enummetadata=$(IntermediateOutputPath)mcw/enummetadata
- <_Assembly>"--assembly=$(AssemblyName)"
- <_TypeMap>--type-map-report=$(IntermediateOutputPath)mcw/type-mapping.txt
- <_Api>android.xml
- <_Dirs>--enumdir=$(IntermediateOutputPath)mcw
- <_FullIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)'))
- <_LangFeatures>--lang-features=nullable-reference-types,default-interface-methods,nested-interface-types,interface-constants
-
-
- <_RefAsmDir Include="@(ReferencePathWithRefAssemblies->'%(RootDir)%(Directory).'->Distinct())" />
- <_Lib Include="@(_RefAsmDir->'-L "%(Identity)"')" />
- <_JavaBaseRef Include="@(ReferencePathWithRefAssemblies)"
- Condition=" '%(FileName)' == 'Java.Base' "
- />
- <_Ref Include="@(_JavaBaseRef->'-r "%(FullPath)"')" />
-
-
-
-
-
-
-
-
-
-
-
-
- $(DefineConstants);$([System.String]::Copy('$(_GeneratedDefineConstants)').Replace ('%24(DefineConstants);', ''))
-
-
-
-
-
-
-
-
- <_JcwGenRefAsmDirs Include="@(ReferencePathWithRefAssemblies->'%(RootDir)%(Directory).'->Distinct())" />
-
-
- <_JcwGen>"$(UtilityOutputFullPath)/jcw-gen.dll"
- <_Target>--codegen-target JavaInterop1
- <_Output>-o "$(_JcwOutputDir)"
- <_Libpath>@(_JcwGenRefAsmDirs->'-L "%(Identity)"', ' ')
-
-
-
-
-
-
- <_BuildAppApkInput Include="$(MSBuildThisFileFullPath)" />
- <_BuildAppApkInput Include="app\src\main\java\**\*.java" />
- <_BuildAppApkInput Include="app\src\main\AndroidManifest.xml" />
- <_BuildAppApkInput Include="app\**\build.gradle" />
- <_BuildAppApkInput Include="$(NativeBinary)" />
- <_BuildAppApkInput Include="$(OutputPath)java-interop.jar" />
-
-
-
- <_AfterBuildDependsOnTargets>
- _CreateJavaCallableWrappers;
-
-
-
-
-
-
- <_GradleRtxtPath>app\build\intermediates\runtime_symbol_list\release\R.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_GradleBuildSource Include="$(NativeBinary)" />
- <_GradleBuildTarget Include="$(_GradleJniLibsDir)\lib$(AssemblyName)$(NativeBinaryExt)" />
-
- <_GradleBuildSource Include="$(OutputPath)java-interop.jar" />
- <_GradleBuildTarget Include="app\lib\java-interop.jar" />
-
-
-
-
-
-
diff --git a/samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs b/samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs
deleted file mode 100644
index 3b22b56d6..000000000
--- a/samples/Hello-NativeAOTFromAndroid/JavaInteropRuntime.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System.Runtime.InteropServices;
-
-using Java.Interop;
-
-namespace Java.Interop.Samples.NativeAotFromAndroid;
-
-static class JavaInteropRuntime
-{
- static JniRuntime? runtime;
-
- [UnmanagedCallersOnly (EntryPoint="JNI_OnLoad")]
- static int JNI_OnLoad (IntPtr vm, IntPtr reserved)
- {
- try {
- AndroidLog.Print (AndroidLogLevel.Info, "JavaInteropRuntime", "JNI_OnLoad()");
- LogcatTextWriter.Init ();
- return (int) JniVersion.v1_6;
- }
- catch (Exception e) {
- AndroidLog.Print (AndroidLogLevel.Error, "JavaInteropRuntime", $"JNI_OnLoad() failed: {e}");
- return 0;
- }
- }
-
- [UnmanagedCallersOnly (EntryPoint="JNI_OnUnload")]
- static void JNI_OnUnload (IntPtr vm, IntPtr reserved)
- {
- AndroidLog.Print(AndroidLogLevel.Info, "JavaInteropRuntime", "JNI_OnUnload");
- runtime?.Dispose ();
- }
-
- // symbol name from `$(IntermediateOutputPath)obj/Release/osx-arm64/h-classes/net_dot_jni_hello_JavaInteropRuntime.h`
- [UnmanagedCallersOnly (EntryPoint="Java_net_dot_jni_nativeaot_JavaInteropRuntime_init")]
- static void init (IntPtr jnienv, IntPtr klass)
- {
- Console.WriteLine ($"C# init()");
- try {
- var options = new JreRuntimeOptions {
- EnvironmentPointer = jnienv,
- JniGlobalReferenceLogWriter = new LogcatTextWriter (AndroidLogLevel.Debug, "NativeAot:GREF"),
- JniLocalReferenceLogWriter = new LogcatTextWriter (AndroidLogLevel.Debug, "NativeAot:LREF"),
- };
- runtime = options.CreateJreVM (new NativeAotTypeManager ());
- }
- catch (Exception e) {
- AndroidLog.Print (AndroidLogLevel.Error, "JavaInteropRuntime", $"JavaInteropRuntime.init: error: {e}");
- }
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/LogcatTextWriter.cs b/samples/Hello-NativeAOTFromAndroid/LogcatTextWriter.cs
deleted file mode 100644
index 36f2f2a90..000000000
--- a/samples/Hello-NativeAOTFromAndroid/LogcatTextWriter.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Java.Interop.Samples.NativeAotFromAndroid;
-
-internal sealed class LogcatTextWriter : TextWriter {
-
- public static void Init ()
- {
- // This method is a no-op, but it's necessary to ensure the static
- // constructor is executed.
- }
-
- static LogcatTextWriter ()
- {
- Console.SetOut (new LogcatTextWriter (AndroidLogLevel.Info));
- Console.SetError (new LogcatTextWriter (AndroidLogLevel.Error));
- }
-
- AndroidLogLevel Level;
- string Tag;
-
- internal LogcatTextWriter (AndroidLogLevel level, string tag = "NativeAotFromAndroid")
- {
- Level = level;
- Tag = tag;
- }
-
- public override Encoding Encoding => Encoding.UTF8;
- public override string NewLine => "\n";
-
- public override void WriteLine (string? value)
- {
- if (value == null) {
- AndroidLog.Print (Level, Tag, "");
- return;
- }
- ReadOnlySpan span = value;
- while (!span.IsEmpty) {
- if (span.IndexOf ('\n') is int n && n < 0) {
- break;
- }
- var line = span.Slice (0, n);
- AndroidLog.Print (Level, Tag, line.ToString ());
- span = span.Slice (n + 1);
- }
- AndroidLog.Print (Level, Tag, span.ToString ());
- }
-}
-
-static class AndroidLog {
-
- [DllImport ("log", EntryPoint = "__android_log_print", CallingConvention = CallingConvention.Cdecl)]
- private static extern void __android_log_print(AndroidLogLevel level, string? tag, string format, string args, IntPtr ptr);
-
- internal static void Print(AndroidLogLevel level, string? tag, string message) =>
- __android_log_print(level, tag, "%s", message, IntPtr.Zero);
-
-}
-
-internal enum AndroidLogLevel
-{
- Unknown = 0x00,
- Default = 0x01,
- Verbose = 0x02,
- Debug = 0x03,
- Info = 0x04,
- Warn = 0x05,
- Error = 0x06,
- Fatal = 0x07,
- Silent = 0x08
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/MainActivity.cs b/samples/Hello-NativeAOTFromAndroid/MainActivity.cs
deleted file mode 100644
index 6eefab692..000000000
--- a/samples/Hello-NativeAOTFromAndroid/MainActivity.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Java.Interop;
-
-namespace Java.Interop.Samples.NativeAotFromAndroid;
-
-[JniTypeSignature ("my/MainActivity")]
-public class MainActivity : Android.App.Activity {
-
- public MainActivity ()
- {
- Console.WriteLine ("MainActivity..ctor()");
- }
-
- protected override void OnCreate (Android.OS.Bundle? savedInstanceState)
- {
- Console.WriteLine ($"MainActivity.OnCreate(): savedInstanceState? {savedInstanceState != null}");
- base.OnCreate (savedInstanceState);
- SetContentView (R.layout.activity_main);
-
- PrintGrefInfo ();
- }
-
- static void PrintGrefInfo ()
- {
- var runtime = JniEnvironment.Runtime;
- var peers = runtime.ValueManager.GetSurfacedPeers ();
- Console.WriteLine ($"Created {runtime.ObjectReferenceManager.GlobalReferenceCount} GREFs; Surfaced {peers.Count} peers");
- for (int i = 0; i < peers.Count; ++i) {
- Console.WriteLine ($" SurfacedPeers[{i,3}] = {ToString (peers[i])}");
- }
- }
-
- static string ToString (JniSurfacedPeerInfo peer)
- {
- if (!peer.SurfacedPeer.TryGetTarget (out var p)) {
- return $"JniSurfacedPeerInfo(IdentityHashCode=0x{peer.JniIdentityHashCode:x})";
- }
- return $"JniSurfacedPeerInfo(PeerReference={p.PeerReference} IdentityHashCode=0x{peer.JniIdentityHashCode:x} Instance.Type={p.GetType ()})";
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/NativeAotTypeManager.cs b/samples/Hello-NativeAOTFromAndroid/NativeAotTypeManager.cs
deleted file mode 100644
index caa5187a7..000000000
--- a/samples/Hello-NativeAOTFromAndroid/NativeAotTypeManager.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-using Java.Interop;
-
-namespace Java.Interop.Samples.NativeAotFromAndroid;
-
-partial class NativeAotTypeManager : JniRuntime.JniTypeManager {
-
- internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
- internal const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;
- internal const DynamicallyAccessedMemberTypes MethodsConstructors = MethodsAndPrivateNested | DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
-
- Dictionary typeMappings = new () {
- ["android/app/Activity"] = typeof (Android.App.Activity),
- ["android/content/Context"] = typeof (Android.Content.Context),
- ["android/content/ContextWrapper"] = typeof (Android.Content.ContextWrapper),
- ["android/os/BaseBundle"] = typeof (Android.OS.BaseBundle),
- ["android/os/Bundle"] = typeof (Android.OS.Bundle),
- ["android/view/ContextThemeWrapper"] = typeof (Android.View.ContextThemeWrapper),
- ["my/MainActivity"] = typeof (MainActivity),
- };
-
- public override void RegisterNativeMembers (
- JniType nativeClass,
- [DynamicallyAccessedMembers (MethodsAndPrivateNested)]
- Type type,
- ReadOnlySpan methods)
- {
- if (TryRegisterBuiltInNativeMembers (nativeClass, nativeClass.Name, methods))
- return;
- if (!methods.IsEmpty)
- throw new NotSupportedException ($"Could not register native members for type '{type.FullName}'.");
- }
-
- [Obsolete ("Use RegisterNativeMembers(JniType, Type, ReadOnlySpan)")]
- public override void RegisterNativeMembers (
- JniType nativeClass,
- [DynamicallyAccessedMembers (MethodsAndPrivateNested)]
- Type type,
- string? methods)
- {
- RegisterNativeMembers (nativeClass, type, methods.AsSpan ());
- }
-
- protected override IEnumerable GetTypesForSimpleReference (string jniSimpleReference)
- {
- var target = GetTypeForSimpleReference (jniSimpleReference);
- if (target != null)
- yield return target;
- }
-
- protected override string? GetSimpleReference (Type type)
- {
- return GetSimpleReferences (type).FirstOrDefault ();
- }
-
- [return: DynamicallyAccessedMembers (MethodsConstructors)]
- protected override Type? GetTypeForSimpleReference (string jniSimpleReference)
- {
- return jniSimpleReference switch {
- "V" => typeof (void),
- "Z" => typeof (bool),
- "java/lang/Boolean" => typeof (bool?),
- "B" => typeof (sbyte),
- "java/lang/Byte" => typeof (sbyte?),
- "C" => typeof (char),
- "java/lang/Character" => typeof (char?),
- "S" => typeof (short),
- "java/lang/Short" => typeof (short?),
- "I" => typeof (int),
- "java/lang/Integer" => typeof (int?),
- "J" => typeof (long),
- "java/lang/Long" => typeof (long?),
- "F" => typeof (float),
- "java/lang/Float" => typeof (float?),
- "D" => typeof (double),
- "java/lang/Double" => typeof (double?),
- "android/app/Activity" => typeof (Android.App.Activity),
- "android/content/Context" => typeof (Android.Content.Context),
- "android/content/ContextWrapper" => typeof (Android.Content.ContextWrapper),
- "android/os/BaseBundle" => typeof (Android.OS.BaseBundle),
- "android/os/Bundle" => typeof (Android.OS.Bundle),
- "android/view/ContextThemeWrapper" => typeof (Android.View.ContextThemeWrapper),
- "my/MainActivity" => typeof (MainActivity),
- _ => null,
- };
- }
-
- protected override IEnumerable GetSimpleReferences (Type type)
- {
- return CreateSimpleReferencesEnumerator (type);
- }
-
- IEnumerable CreateSimpleReferencesEnumerator (Type type)
- {
- if (typeMappings == null)
- yield break;
- foreach (var e in typeMappings) {
- if (e.Value == type)
- yield return e.Key;
- }
- }
-
- public override IEnumerable GetTypes (JniTypeSignature typeSignature)
- {
- if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
- return [];
- return GetTypesForSimpleReference (typeSignature.SimpleReference);
- }
-
- public override IEnumerable GetReflectionConstructibleTypes (JniTypeSignature typeSignature)
- {
- if (!typeSignature.IsValid || typeSignature.ArrayRank != 0 || typeSignature.SimpleReference == null)
- yield break;
- var target = GetTypeForSimpleReference (typeSignature.SimpleReference);
- if (target != null)
- yield return new JniRuntime.JniTypeManager.ReflectionConstructibleType (target);
- }
-
- protected override JniTypeSignature GetTypeSignatureCore (Type type)
- {
- var simpleReference = GetSimpleReferences (type).FirstOrDefault ();
- return simpleReference == null ? default : new JniTypeSignature (simpleReference, 0, false);
- }
-
- protected override IEnumerable GetTypeSignaturesCore (Type type)
- {
- var signature = GetTypeSignatureCore (type);
- if (signature.IsValid)
- yield return signature;
- }
-
- [return: DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
- protected override Type? GetInvokerTypeCore (
- [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
- Type type)
- {
- return null;
- }
-
- protected override IReadOnlyList? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
- {
- return null;
- }
-
- protected override string? GetReplacementTypeCore (string jniSimpleReference)
- {
- return null;
- }
-
- protected override JniRuntime.ReplacementMethodInfo? GetReplacementMethodInfoCore (string jniSourceType, string jniMethodName, string jniMethodSignature)
- {
- return null;
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/README.md b/samples/Hello-NativeAOTFromAndroid/README.md
deleted file mode 100644
index e988722a5..000000000
--- a/samples/Hello-NativeAOTFromAndroid/README.md
+++ /dev/null
@@ -1,264 +0,0 @@
-# Hello From Android
-
-[Hello-NativeAOTFromJNI](../Hello-NativeAOTFromJNI) demonstrated how
-to use [NativeAOT][0] to create a native library which could be loaded
-by a Java Virtual Machine (JVM).
-
-Extend this idea for Android!
-
-## Prerequisites
-
-In order to build this sample, the Android SDK and Android NDK must be present.
-*An* easy way to provision these is to build dotnet/android:
-
- * [Windows build instructions](https://github.com/dotnet/android/blob/155709f9917666ca046c79a4e9769924ff4ab9bb/Documentation/building/windows/instructions.md)
- * [Linux and macOS build instructions](https://github.com/dotnet/android/blob/main/Documentation/building/unix/instructions.md)
-
-Once you've run `make prepar` or `dotnet msbuild Xamarin.Android.sln -t:Prepare`,
-then an `android-toolchain` directory will exist in your home directory.
-
-A `.android/debug.keystore` file must also exist within your home directory.
-This file can be created by using
-[`keytool -genkeypair`](https://docs.oracle.com/en/java/javase/11/tools/keytool.html).
-
- * On **Windows**, run the following command within a `CMD.EXE` window:
-
- ```cmd
- %HOMEDRIVE%%HOMEPATH%\android-toolchain\jdk-17\bin\keytool.exe -genkeypair ^
- -keyalg RSA -validity 10950 -dname "CN=Android Debug,O=Android,C=US" ^
- -keystore %HOMEDRIVE%%HOMEPATH%\.android\debug.keystore ^
- -alias androiddebugkey -storepass android -keypass android
- ```
-
- * On **Linux** and **macOS**, run:
-
- ```sh
- $HOME/android-toolchain/jdk-17/bin/keytool -genkeypair \
- -keyalg RSA -validity 10950 -dname "CN=Android Debug,O=Android,C=US" \
- -keystore $HOME/.android/debug.keystore \
- -alias androiddebugkey -storepass android -keypass android
- ```
-
-The NativeAOT toolchain on Windows also requires that the NDK "prebuilt"
-directory be located within `%PATH%`
-
-```cmd
-set PATH=%HOMEDRIVE%%HOMEPATH%\android-toolchain\ndk\toolchains\llvm\prebuilt\windows-x86_64\bin;%PATH%
-```
-
-## Building
-
-Building a native library with NativeAOT requires a Release configuration build.
-For in-repo use, that means that xamarin/Java.Interop itself needs to be built in
-Release configuration:
-
-```sh
-% dotnet build -c Release -t:Prepare
-% dotnet build -c Release
-```
-
-Once Java.Interop itself is built, you can *publish* the sample:
-
-```sh
-% cd samples/Hello-NativeAOTFromAndroid
-
-# set the ANDROID_NDK_HOME environment variable or set the AndroidNdkDirectory property
-# set the ANDROID_HOME environment variable or set the AndroidSdkDirectory property
-# values here are valid if you have a xamarin/xamarin-android build environment.
-% dotnet publish -c Release -p:AndroidNdkDirectory=$HOME/android-toolchain/ndk \
- -p:AndroidSdkDirectory=$HOME/android-toolchain/sdk
-```
-
-The resulting native library contains various import symbols:
-
-```sh
-% nm -D bin/Release/linux-bionic-arm64/native/Hello-NativeAOTFromAndroid.so | grep ' T '
-0000000000240950 T JNI_OnLoad@@V1.0
-0000000000240ab0 T JNI_OnUnload@@V1.0
-0000000000240b30 T Java_net_dot_jni_nativeaot_JavaInteropRuntime_init@@V1.0
-00000000002392e0 T __start___managedcode
-00000000004394d0 T __start___unbox
-00000000004394d0 T __stop___managedcode
-000000000043a720 T __stop___unbox
-```
-
-The build system also produces a `net.dot.jni.helloandroid-Signed.apk`,
-which can be installed and launched:
-
-```sh
-% adb install bin/Release/linux-bionic-arm64/net.dot.jni.helloandroid-Signed.apk
-% adb shell am start net.dot.jni.helloandroid/my.MainActivity
-
-# Only-java codepath for testing; doesn't use NativeAOT:
-% adb shell am start net.dot.jni.helloandroid/net.dot.jni.nativeaot.JavaMainActivity
-```
-
-## Logging
-
-By default this sample writes quite a bit to `adb logcat`, including:
-
- * Initialization messages
-
- ```
- D NativeAotRuntimeProvider: NativeAotRuntimeProvider()
- D NativeAotRuntimeProvider: NativeAotRuntimeProvider.attachInfo(): calling JavaInteropRuntime.init()…
- D JavaInteropRuntime: Loading libHello-NativeAOTFromAndroid.so…
- I JavaInteropRuntime: JNI_OnLoad()
- I NativeAotFromAndroid: C# init()
- D NativeAotRuntimeProvider: NativeAotRuntimeProvider.onCreate()
- ```
-
- * JNI Global Reference and Local Reference messages
-
- ```
- D NativeAot:LREF: +l+ lrefc 1 handle 0x7eb64ae01d/L from thread ''(1)
- D NativeAot:GREF: +g+ grefc 1 obj-handle 0x7eb64ae01d/L -> new-handle 0x2af2/G from thread ''(1)
- ```
-
- * `MainActivity` messages
-
- ```
- I NativeAotFromAndroid: MainActivity..ctor()
- I NativeAotFromAndroid: MainActivity.OnCreate(): savedInstanceState? False
- ```
-
-Additionally, the end of `MainActivity.OnCreate()` will print out how many
-GREFs have been created, and information about the created "surfaced peers":
-
-```
-I NativeAotFromAndroid: Created 6 GREFs; Surfaced 1 peers
-I NativeAotFromAndroid: SurfacedPeers[ 0] = JniSurfacedPeerInfo(PeerReference=0x2bc6/G IdentityHashCode=0x1d64f40 Instance.Type=Java.Interop.Samples.NativeAotFromAndroid.MainActivity)
-```
-
-The (very!) extensive logging around JNI Global and Local references mean that
-this sample should *not* be used as-is for startup timing comparison.
-That said, on my Pixel 6, we get:
-
-```
-I ActivityTaskManager: Displayed net.dot.jni.helloandroid/my.MainActivity for user 0: +282ms
-```
-
-## What does this mean for .NET for Android?
-
-Short-term? Nothing. Long-term? *Maybe* something.
-
-While .NET for Android uses Java.Interop, it uses a different *style* of Java.Interop.
-.NET for Android *could* be updated to support NativeAot, but it would not be as simple
-as this sample may suggest. Difficulties will include:
-
- * [GC](#gc)
- * [Marshal Methods](#marshal-methods)
- * [Process Startup miscellany, including the important question "what is an Assembly?"](#miscellany)
-
-### GC
-
-.NET for Android relies on .NET's MonoVM, which provides a
-[GC bridge](https://github.com/dotnet/runtime/blob/c5c7f0d3d11cc82eddf1747fbdcaec9cb850c3aa/src/native/public/mono/metadata/details/sgen-bridge-types.h),
-which is used to support cross-VM object references. This allows an object
-reference within a Java VM to keep an object instance within the .NET VM alive.
-
-Neither CoreCLR nor NativeAot runtimes support such a GC bridge, and without
-something like it, developers would need to take *significantly* more care in
-object lifetimes and cleanup.
-
-Until a cross-VM GC solution is found, .NET for Android must remain on MonoVM.
-
-### Marshal Methods
-
-"Marshal Methods" are methods that are:
-
- * Invoked by the Java Virtual Machine when a `native` Java method is invoked.
- * Responsible for parameter marshaling, invoking C# method overrides, and
-marshaling the return type back to Java.
-
-.NET for Android uses `generator --codegen-target=XAJavaInterop1` for binding
-assemblies, which "bakes in" marshal methods. There is an implicit ABI for
-marshal methods, and part of that ABI is that they don't catch exceptions:
-
-```csharp
-partial class Activity {
- protected virtual unsafe void OnCreate (Android.OS.Bundle? savedInstanceState) => …
-
- static Delegate? cb_onCreate_Landroid_os_Bundle_;
- static Delegate GetOnCreate_Landroid_os_Bundle_Handler ()
- {
- if (cb_onCreate_Landroid_os_Bundle_ == null)
- cb_onCreate_Landroid_os_Bundle_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_OnCreate_Landroid_os_Bundle_));
- return cb_onCreate_Landroid_os_Bundle_;
- }
-
- static void n_OnCreate_Landroid_os_Bundle_ (IntPtr jnienv, IntPtr native__this, IntPtr native_savedInstanceState)
- {
- // Note: no try/catch block! If `__this.OnCreate()` throws, Bad Things™ will happen.
- var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
- var savedInstanceState = global::Java.Lang.Object.GetObject (native_savedInstanceState, JniHandleOwnership.DoNotTransfer);
- __this.OnCreate (savedInstanceState);
- }
-}
-```
-
-`Activity.n_OnCreate_Landroid_os_Bundle_()` is the marshal method responsible for
-invoking `Activity.OnCreate()`. It does not catch exceptions, and if an exception
-*were* thrown from `Activity.OnCreate()`, the entire app could exit. Consequently,
-every such marshal method is wrapped in `JNINativeWrapper.CreateDelegate()`, which
-uses `DynamicMethod` to wrap the marshal method in a `try`/`catch` block, which
-is responsible for notifying the debugger and exception marshaling.
-
-As-is, none of this can work with NativeAot.
-
-Updating .NET for Android to *not* use `DynamicMethod` has both known and unknown
-issues (what new pattern do we use? What about compatibility with existing
-binding assemblies?).
-
-This sample uses `generator --codegen-target=JavaInterop1` for binding assemblies,
-which *skips* the emission of marshal methods *entirely*. As Marshal Methods are
-*required*, `jnimarshalmethod-gen` is invoked as a post-build step to insert
-Marshal Methods into the assemblies, and these marshal methods appropriately
-marshal exceptions.
-
-## Miscellany
-
-.NET for Android deals with assemblies: they can be side-loaded (for Fast Deployment),
-packaged trimmed or untrimmed. Bidirectional mapping between JNI type names and
-`System.Type` instances makes extensive use of MonoVM's embedding API.
-
-None of the above exists in NativeAot: there are no separate assembly files,
-"assembly identity" is a nebulous concept, and there is no equivalent to the MonoVm
-embedding API.
-
-Large portions of .NET for Android would need to be rewritten to support NativeAot,
-and NativeAot would actively prevent features such as Fast Deployment, meaning *both*
-MonoVM and NativeAot would need to be supported.
-
-## Notes
-
-As with `Hello-NativeAOTFromJNI`, the project needs to be built with
-`$(PlatformTarget)`=AnyCPU, so that `jnimarshalmethod-gen` can be used
-to generate JNI Marshal Methods as a post-build step.
-
-This project contains a *tiny* `android.xml` API description for Android.
-This is used to generate a binding, allowing (nominally) intuitive:
-
-```csharp
-[JniTypeSignature ("my/MainActivity")]
-partial class MainActivity : Android.App.Activity {
- protected override void OnCreate (Android.OS.Bundle? savedInstanceState) => …
-}
-```
-
-This project follows what .NET for Android does to initialize things:
-provide a custom [`ContentProvider`][1] which contains Java "bootstrap"
-code to initialize the runtime.
-
-### GC
-
-As with [Hello-NativeAOTFromJNI](../Hello-NativeAOTFromJNI), NativeAOT does not
-provide a GC bridge that we can rely on. Consequently, every "surfaced peer" will
-*never be collected by default*.
-
-This is a *sample*, not a product, and not even the *inkling* of a product.
-
-For exploratory purposes only.
-
-[0]: https://github.com/dotnet/samples/blob/main/core/nativeaot/NativeLibrary/README.md
-[1]: https://developer.android.com/reference/android/content/ContentProvider
diff --git a/samples/Hello-NativeAOTFromAndroid/Transforms/Metadata.xml b/samples/Hello-NativeAOTFromAndroid/Transforms/Metadata.xml
deleted file mode 100644
index 26c2f6238..000000000
--- a/samples/Hello-NativeAOTFromAndroid/Transforms/Metadata.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/samples/Hello-NativeAOTFromAndroid/Transforms/enumflags b/samples/Hello-NativeAOTFromAndroid/Transforms/enumflags
deleted file mode 100644
index e69de29bb..000000000
diff --git a/samples/Hello-NativeAOTFromAndroid/Transforms/map.csv b/samples/Hello-NativeAOTFromAndroid/Transforms/map.csv
deleted file mode 100644
index e69de29bb..000000000
diff --git a/samples/Hello-NativeAOTFromAndroid/Transforms/methodmap.csv b/samples/Hello-NativeAOTFromAndroid/Transforms/methodmap.csv
deleted file mode 100644
index e69de29bb..000000000
diff --git a/samples/Hello-NativeAOTFromAndroid/android.xml b/samples/Hello-NativeAOTFromAndroid/android.xml
deleted file mode 100644
index d52bd14b3..000000000
--- a/samples/Hello-NativeAOTFromAndroid/android.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Hello-NativeAOTFromAndroid/app/.gitignore b/samples/Hello-NativeAOTFromAndroid/app/.gitignore
deleted file mode 100644
index 13775520f..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/build
-lib/java-interop.jar
-src/main/java/my
-src/main/jniLibs
-
diff --git a/samples/Hello-NativeAOTFromAndroid/app/build.gradle b/samples/Hello-NativeAOTFromAndroid/app/build.gradle
deleted file mode 100644
index 2ac125e3e..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-plugins {
- id 'com.android.application'
-}
-
-dependencies {
- implementation files('lib/java-interop.jar')
-}
-
-android {
- namespace 'net.dot.jni.helloandroid'
- compileSdk 33
- // Doing this to match NDK NativeAOT is using
- ndkVersion "23.2.8568313"
-
- defaultConfig {
- applicationId "net.dot.jni.helloandroid"
- minSdk 21
- targetSdk 33
- versionCode 1
- versionName "1.0"
-
- // NOTE: for now, arm64 only. Might eventually do 4 ABIs
- ndk {
- abiFilters 'arm64-v8a'
- }
- }
-
- // Just use the built-in debug keystore
- signingConfigs {
- release {
- storeFile file("${System.getProperty('user.home')}/.android/debug.keystore")
- storePassword 'android'
- keyAlias 'androiddebugkey'
- keyPassword 'android'
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- signingConfig signingConfigs.release
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/app/proguard-rules.pro b/samples/Hello-NativeAOTFromAndroid/app/proguard-rules.pro
deleted file mode 100644
index f1b424510..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/AndroidManifest.xml b/samples/Hello-NativeAOTFromAndroid/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 6e1f849a7..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaInteropRuntime.java b/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaInteropRuntime.java
deleted file mode 100644
index 26811bed8..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaInteropRuntime.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.dot.jni.nativeaot;
-
-import android.util.Log;
-
-public class JavaInteropRuntime {
- static {
- Log.d("JavaInteropRuntime", "Loading libHello-NativeAOTFromAndroid.so…");
- System.loadLibrary("Hello-NativeAOTFromAndroid");
- }
-
- private JavaInteropRuntime() {
- }
-
- public static native void init();
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaMainActivity.java b/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaMainActivity.java
deleted file mode 100644
index b8334ac25..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/JavaMainActivity.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.dot.jni.nativeaot;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-
-import net.dot.jni.helloandroid.R;
-
-public class JavaMainActivity extends Activity {
- private static final String TAG = "NativeAot:JavaMainActivity";
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- Log.i(TAG, "JavaMainActivity.onCreate()");
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/NativeAotRuntimeProvider.java b/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/NativeAotRuntimeProvider.java
deleted file mode 100644
index 9ac3259af..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/src/main/java/net/dot/jni/nativeaot/NativeAotRuntimeProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package net.dot.jni.nativeaot;
-
-import android.util.Log;
-
-public class NativeAotRuntimeProvider
- extends android.content.ContentProvider
-{
- private static final String TAG = "NativeAotRuntimeProvider";
-
- public NativeAotRuntimeProvider() {
- Log.d(TAG, "NativeAotRuntimeProvider()");
- }
-
- @Override
- public boolean onCreate() {
- Log.d(TAG, "NativeAotRuntimeProvider.onCreate()");
- return true;
- }
-
- @Override
- public void attachInfo(android.content.Context context, android.content.pm.ProviderInfo info) {
- Log.d(TAG, "NativeAotRuntimeProvider.attachInfo(): calling JavaInteropRuntime.init()…");
- JavaInteropRuntime.init();
- super.attachInfo (context, info);
- }
-
- @Override
- public android.database.Cursor query(android.net.Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
- throw new RuntimeException ("This operation is not supported.");
- }
-
- @Override
- public String getType(android.net.Uri uri) {
- throw new RuntimeException ("This operation is not supported.");
- }
-
- @Override
- public android.net.Uri insert(android.net.Uri uri, android.content.ContentValues initialValues) {
- throw new RuntimeException ("This operation is not supported.");
- }
-
- @Override
- public int delete(android.net.Uri uri, String where, String[] whereArgs) {
- throw new RuntimeException ("This operation is not supported.");
- }
-
- @Override
- public int update(android.net.Uri uri, android.content.ContentValues values, String where, String[] whereArgs) {
- throw new RuntimeException ("This operation is not supported.");
- }
-}
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/libs/arm64-v8a/libdotnet.so.dbg b/samples/Hello-NativeAOTFromAndroid/app/src/main/libs/arm64-v8a/libdotnet.so.dbg
deleted file mode 100644
index dfb82ed6d..000000000
Binary files a/samples/Hello-NativeAOTFromAndroid/app/src/main/libs/arm64-v8a/libdotnet.so.dbg and /dev/null differ
diff --git a/samples/Hello-NativeAOTFromAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/samples/Hello-NativeAOTFromAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d114..000000000
--- a/samples/Hello-NativeAOTFromAndroid/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-