From c67db3d218e2e2f24a33bb94b5323deeed7fc3f5 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Tue, 28 Feb 2017 13:55:59 +0100 Subject: [PATCH] Disable DBGIPC_TRANSPORT_DI and DBGIPC_TRANSPORT_VM on Android (dotnet/coreclr#9809) * Disable DBGIPC_TRANSPORT_DI and DBGIPC_TRANSPORT_VM on Android Commit migrated from https://github.com/dotnet/coreclr/commit/b0a0d52e7d273a46ec6e2c39dbc816d98dcbe217 --- src/coreclr/clrdefinitions.cmake | 2 +- src/coreclr/src/debug/di/platformspecific.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 4845b8f..94c9197 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -115,7 +115,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_CORESYSTEM) add_definitions(-DFEATURE_CORRUPTING_EXCEPTIONS) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID)) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM) endif(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/coreclr/src/debug/di/platformspecific.cpp b/src/coreclr/src/debug/di/platformspecific.cpp index 9df22b1..2565a5b 100644 --- a/src/coreclr/src/debug/di/platformspecific.cpp +++ b/src/coreclr/src/debug/di/platformspecific.cpp @@ -16,7 +16,7 @@ #include "dbgtransportpipeline.cpp" #include "shimremotedatatarget.cpp" #include "remoteeventchannel.cpp" -#else +#elif WIN32 #include "WindowsPipeline.cpp" #include "EventRedirectionPipeline.cpp" #include "ShimLocalDataTarget.cpp" -- 2.7.4