File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -108,6 +108,7 @@ prepare-deps: prepare-external
108108prepare-props : prepare-deps
109109 cp build-tools/scripts/Configuration.Java.Interop.Override.props external/Java.Interop/Configuration.Override.props
110110 cp $(call GetPath,MonoSource) /mcs/class/msfinal.pub .
111+ cp build-tools/scripts/java-interop.dllmap external/Java.Interop/Java.Runtime.Environment.Override.dllmap
111112
112113prepare-msbuild : prepare-props
113114ifeq ($(USE_MSBUILD ) ,1)
Original file line number Diff line number Diff line change 1+ <dllmap dll="java-interop" os="osx" target="lib/host-Darwin/libmono-android.debug.dylib" />
2+ <dllmap dll="java-interop" os="linux" target="lib/host-Linux/libmono-android.debug.so" />
3+ <dllmap dll="java-interop" os="windows" wordsize="64" target="lib/host-mxe-Win64/libmono-android.debug.dll" />
4+ <dllmap dll="java-interop" os="windows" wordsize="32" target="lib/host-mxe-Win32/libmono-android.debug.dll" />
Original file line number Diff line number Diff line change 146146 <Target Name =" _CreateJavaInteropDllConfig"
147147 Inputs =" $(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll"
148148 Outputs =" $(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll.config" >
149+ <ReadLinesFromFile
150+ File=" ../../build-tools/scripts/java-interop.dllmap" >
151+ <Output
152+ TaskParameter =" Lines"
153+ ItemName =" _JavaInteropDllMapContent" />
154+ </ReadLinesFromFile >
149155 <WriteLinesToFile
150156 File =" $(XAInstallPrefix)xbuild\Xamarin\Android\Java.Interop.dll.config"
151- Lines =" < configuration>
152- < dllmap dll=" java-interop" os=" osx" target=" lib/host-Darwin/libmono-android.debug.dylib" />
153- < dllmap dll=" java-interop" os=" linux" target=" lib/host-Linux/libmono-android.debug.so" />
154- < dllmap dll=" java-interop" os=" windows" wordsize=" 64" target=" lib/host-mxe-Win64/libmono-android.debug.dll" />
155- < dllmap dll=" java-interop" os=" windows" wordsize=" 32" target=" lib/host-mxe-Win32/libmono-android.debug.dll" />
156- < /configuration> "
157+ Lines =" < configuration> ;@(_JavaInteropDllMapContent);< /configuration> "
157158 Overwrite =" True"
158159 />
159160 </Target >
You can’t perform that action at this time.
0 commit comments