From 6acc45fe81c381022e2150198bf4fc2cdeec449a Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Wed, 8 Apr 2020 11:16:14 -0500
Subject: [PATCH] [Mono.Android] Enable NRT generator flag.

---
 external/Java.Interop                 | 2 +-
 src/Mono.Android/Mono.Android.targets | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index 4218831db37..57df7b7b295 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 4218831db37c96709321ee2ba9a1064a5ce2f479
+Subproject commit 57df7b7b295be7a2dffac88f8591728e02ea381e
diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets
index f302ab3b1bb..9992212b49a 100644
--- a/src/Mono.Android/Mono.Android.targets
+++ b/src/Mono.Android/Mono.Android.targets
@@ -107,7 +107,8 @@
       <_Api>$(IntermediateOutputPath)mcw\api.xml</_Api>
       <_Dirs>--enumdir=$(IntermediateOutputPath)mcw</_Dirs>
       <_FullIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(IntermediateOutputPath)'))</_FullIntermediateOutputPath>
-      <_LangFeatures Condition="$(AndroidApiLevel) &gt;= 30">--lang-features=default-interface-methods,nested-interface-types,interface-constants</_LangFeatures>
+      <_LangFeatures>--lang-features=nullable-reference-types</_LangFeatures>
+      <_LangFeatures Condition="$(AndroidApiLevel) &gt;= 30">$(_LangFeatures),default-interface-methods,nested-interface-types,interface-constants</_LangFeatures>
     </PropertyGroup>
     <Exec
         Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(Generator) $(_GenFlags) $(_ApiLevel) $(_Out) $(_Codegen) $(_Fixup) $(_Enums1) $(_Enums2) $(_Versions) $(_Annotations) $(_Assembly) $(_TypeMap) $(_LangFeatures) $(_Dirs) $(_Api)"