Skip to content

Ignore interfaces when generating JavaCallableWrappers #5859

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

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Ignore interfaces when generating JavaCallableWrappers #5859

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
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from a3de91 to f9faaa
5 changes: 5 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ bool CreateJavaSources (IEnumerable<TypeDefinition> javaTypes, TypeDefinitionCac

bool ok = true;
foreach (var t in javaTypes) {
if (t.IsInterface) {
// Interfaces are in typemap but they shouldn't have JCW generated for them
continue;
}

using (var writer = MemoryStreamPool.Shared.CreateStreamWriter ()) {
try {
var jti = new JavaCallableWrapperGenerator (t, Log.LogWarning, cache) {
Expand Down
3 changes: 2 additions & 1 deletion src/monodroid/jni/build-info.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace xamarin::android::internal
{
#define STRINGIFY(_val_) #_val_
#define API_STRING(_api_) STRINGIFY(_api_)
#define VERSION_STRING(_major_, _minor_, _build_) STRINGIFY(_major_) "." STRINGIFY(_minor_) "." STRINGIFY(_build_)

class BuildInfo final
Expand Down Expand Up @@ -50,7 +51,7 @@ namespace xamarin::android::internal

static constexpr char ndk_api_level[] =
#if defined (__ANDROID_API__)
STRINGIFY(__ANDROID_API__);
API_STRING(__ANDROID_API__);
#else // def __ANDROID_API__
"";
#endif // ndef __ANDROID_API__
Expand Down