diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2019-05-16 19:23:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 19:23:13 +0300 |
| commit | 7082845114f603b3e174c26d9e8fb7f667bc2a51 (patch) | |
| tree | c6ecf98a23f412924948e9592da2c72fc870d9fc /mcs/class/referencesource | |
| parent | da6cb6c685efd62e0b8e36dc932d72eff3425ddd (diff) | |
[monodroid] Introduce 'win32 host' BCL build (#14424)
* [monodroid] Introduce 'win32 host' BCL build
* [sdks] Add _bcl_$(1)_BUILD_FLAGS variable to BclTemplate build step
Allows Android SDK on Windows to pass PROFILE_PLATFORM=win32
* [sdks] Pass _bcl_$(1)_BUILD_FLAGS when building the tests, too
* Copy test source exclusion files from the general monodroid profile
Apparently we don't fall back to the general exclusion sources for tests if the platorm-specific exclusion file does not exist.
* Also add win32 copies of the nunit exclude files:
files=$(find . -name "monodroid*_test*exclude.sources")
for file in $files
do
name=$(basename $file)
pushd $(dirname $file)
cp $name win32_$name
git add win32_$name
popd
done
* [csproj] Update project files
Diffstat (limited to 'mcs/class/referencesource')
| -rw-r--r-- | mcs/class/referencesource/System/net/System/Net/webproxy.cs | 2 | ||||
| -rw-r--r-- | mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/referencesource/System/net/System/Net/webproxy.cs b/mcs/class/referencesource/System/net/System/Net/webproxy.cs index 0f874b3fa5f..e117b841856 100644 --- a/mcs/class/referencesource/System/net/System/Net/webproxy.cs +++ b/mcs/class/referencesource/System/net/System/Net/webproxy.cs @@ -508,7 +508,7 @@ namespace System.Net { throw new PlatformNotSupportedException (); #elif MONOTOUCH return Mono.Net.CFNetwork.GetDefaultProxy (); -#elif MONODROID +#elif MONODROID && !MOBILE_DESKTOP_HOST // Return the system web proxy. This only works for ICS+. var data = AndroidPlatform.GetDefaultProxy (); if (data != null) diff --git a/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs b/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs index e1be5014b97..eba8d92af81 100644 --- a/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs +++ b/mcs/class/referencesource/mscorlib/system/threading/synchronizationcontext.cs @@ -292,7 +292,7 @@ namespace System.Threading context = GetWinRTContext(); #endif -#if MONODROID +#if MONODROID && !MOBILE_DESKTOP_HOST if (context == null) context = AndroidPlatform.GetDefaultSyncContext (); #endif |