diff options
| author | Bernhard Urban <bernhard.urban@xamarin.com> | 2018-11-07 08:55:36 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2018-11-07 08:55:36 +0300 |
| commit | eee1d634e8b256a6e51bf8a8cf2feac4015fb1bc (patch) | |
| tree | 874a3534aa96b8261226e982c6f64d9f38892d88 | |
| parent | 4d7b7ab37517a13eee8b966cec9c4308ad772c0a (diff) | |
[ios] remove DISABLE_POLICY_EVIDENCE (#11580)
[2018-06] [ios] remove DISABLE_POLICY_EVIDENCE
Originally it was introduced with db3591b
It seems like only the icall definitions were disabled for device
runtimes (which aren't shipped there anyway), however the icalls
themselves are _included_ in the device runtime. Not sure what the
rationale was behind this. Since the original change is very old, I
think it just happened to be like that today. When running with the
interpreter we need the definitions at runtime too (via the optional
icall table that is linked in, so no additional cost for the fullAOT
runtime due to this change).
Backport of https://github.com/mono/mono/pull/11565
| -rw-r--r-- | mono/metadata/icall-def.h | 2 | ||||
| -rw-r--r-- | sdks/builds/ios.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 0918f2f4498..4a2d9fc733a 100644 --- a/mono/metadata/icall-def.h +++ b/mono/metadata/icall-def.h @@ -868,7 +868,6 @@ ICALL(RNG_2, "RngGetBytes", ves_icall_System_Security_Cryptography_RNGCryptoServ ICALL(RNG_3, "RngInitialize", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_RngInitialize) ICALL(RNG_4, "RngOpen", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_RngOpen) -#ifndef DISABLE_POLICY_EVIDENCE ICALL_TYPE(EVID, "System.Security.Policy.Evidence", EVID_1) HANDLES(ICALL(EVID_1, "IsAuthenticodePresent", ves_icall_System_Security_Policy_Evidence_IsAuthenticodePresent)) @@ -891,7 +890,6 @@ ICALL(WINPRIN_2, "IsMemberOfGroupName", ves_icall_System_Security_Principal_Wind ICALL_TYPE(SECSTRING, "System.Security.SecureString", SECSTRING_1) ICALL(SECSTRING_1, "DecryptInternal", ves_icall_System_Security_SecureString_DecryptInternal) ICALL(SECSTRING_2, "EncryptInternal", ves_icall_System_Security_SecureString_EncryptInternal) -#endif /* !DISABLE_POLICY_EVIDENCE */ ICALL_TYPE(SECMAN, "System.Security.SecurityManager", SECMAN_1) ICALL(SECMAN_1, "get_RequiresElevatedPermissions", mono_security_core_clr_require_elevated_permissions) diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index 4a1cabadfb9..9dfba81abc0 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -71,7 +71,7 @@ _ios-$(1)_CPPFLAGS= \ -DMONOTOUCH=1 \ $$(ios-$(1)_SYSROOT) \ -arch $(3) \ - -DSMALL_CONFIG -DDISABLE_POLICY_EVIDENCE=1 -D_XOPEN_SOURCE -DHOST_IOS -DHAVE_LARGE_FILE_SUPPORT=1 \ + -DSMALL_CONFIG -D_XOPEN_SOURCE -DHOST_IOS -DHAVE_LARGE_FILE_SUPPORT=1 \ _ios-$(1)_LDFLAGS= \ -Wl,-no_weak_imports \ |