[monodroid] Remove dependency on $(MonoSourceFullPath)/support/{zlib-helper,nl}.c

These are now compiled in as part of `libmonosgen-2.0.so`, and the BCL more simply InternalCall into the runtime.

Author: luhenry

src/monodroid/CMakeLists.txt

@@ -18,12 +18,6 @@ if(NOT DEFINED SGEN_BRIDGE_VERSION)
   message(FATAL_ERROR "Please set the SGEN_BRIDGE_VERSION variable on command line (-DSGEN_BRIDGE_VERSION=VERSION)")
 endif()
 
-if(NOT DEFINED MONO_PATH)
-  message(FATAL_ERROR "Please set the MONO_PATH variable on command line (-DMONO_PATH=PATH)")
-else()
-  string(REPLACE "\\" "/" MONO_PATH ${MONO_PATH})
-endif()
-
 if(NOT ANDROID)
   if (NOT DEFINED JDK_INCLUDE)
     message(FATAL_ERROR "Please set the JDK_INCLUDE variable on command line (-DJDK_INCLUDE)")
@@ -223,7 +217,6 @@ if (DEFINED CONFIGURATION)
   include_directories("../../bin/${CONFIGURATION}/include")
   include_directories("../../bin/${CONFIGURATION}/include/${ANDROID_ABI}/eglib")
 endif()
-include_directories("${MONO_PATH}/mono/eglib")
 include_directories("jni/zip")
 include_directories("${JAVA_INTEROP_SRC_PATH}")
 
@@ -233,7 +226,6 @@ check_include_files("linux/rtnetlink.h" HAVE_LINUX_RTNETLINK_H)
 set(SOURCES_DIR ${TOP_DIR}/jni)
 set(MONODROID_SOURCES
   ${MONODROID_SOURCES}
-  ${MONO_PATH}/support/zlib-helper.c
   ${SOURCES_DIR}/android-system.cc
   ${SOURCES_DIR}/cpu-arch-detect.cc
   ${SOURCES_DIR}/debug-constants.cc
@@ -256,7 +248,6 @@ set(MONODROID_SOURCES
 if(UNIX)
   set(MONODROID_SOURCES
     ${MONODROID_SOURCES}
-    ${MONO_PATH}/support/nl.c
     ${SOURCES_DIR}/debug.cc
     ${SOURCES_DIR}/monodroid-networkinfo.cc
     ${SOURCES_DIR}/xamarin_getifaddrs.cc

src/monodroid/monodroid.csproj

@@ -46,11 +46,6 @@
       <Name>jnimarshalmethod-gen</Name>
       <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\mono-runtimes\mono-runtimes.csproj">
-      <Project>{C03E6CF1-7460-4CDC-A4AB-292BBC0F61F2}</Project>
-      <Name>mono-runtimes</Name>
-      <ReferenceOutputAssembly>False</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="..\..\build-tools\linux-mingw-dependencies\linux-mingw-dependencies.csproj">
       <Project>{2C1C68CD-CFED-4DEB-A2D3-61D6932F3E8E}</Project>
       <Name>linux-mingw-dependencies</Name>

src/monodroid/monodroid.props

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <_CommonDefines>-DJDK_INCLUDE="@(JdkIncludePath->'%(Identity)', ' ')" -DMONO_PATH=$(MonoSourceFullPath) -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion)</_CommonDefines>
+    <_CommonDefines>-DJDK_INCLUDE="@(JdkIncludePath->'%(Identity)', ' ')" -DSGEN_BRIDGE_VERSION=$(MonoSgenBridgeVersion)</_CommonDefines>
     <_CmakeCommonHostFlags>$(_CmakeCommonFlags) $(_CommonDefines) -DENABLE_NDK=OFF</_CmakeCommonHostFlags>
 
     <_CmakeMxeCommonFlags>$(_CmakeCommonFlags) $(_CommonDefines) -DENABLE_NDK=OFF</_CmakeMxeCommonFlags>