add dlr to monodroid build.

diff --git a/mcs/class/System.Core/System.Runtime.CompilerServices/ExecutionScope.cs b/mcs/class/System.Core/System.Runtime.CompilerServices/ExecutionScope.cs
index fcde84ffef608cf6ddffac5904da919ab19ea4e0..ef063be4974a686f8bed9f2f8aba0eb623924d8f 100644 (file)
--- a/mcs/class/System.Core/System.Runtime.CompilerServices/ExecutionScope.cs
+++ b/mcs/class/System.Core/System.Runtime.CompilerServices/ExecutionScope.cs
@@ -32,7 +32,7 @@ using System.Linq.Expressions;
 
 namespace System.Runtime.CompilerServices {
 
-#if MOONLIGHT
+#if MOONLIGHT || MONODROID
        [Obsolete ("do not use this type", true)]
 #endif
        public class ExecutionScope {
@@ -41,12 +41,12 @@ namespace System.Runtime.CompilerServices {
                public object [] Locals;
                public ExecutionScope Parent;
 
-#if !MOONLIGHT
+#if !MOONLIGHT && !MONODROID
                internal CompilationContext context;
 #endif
                internal int compilation_unit;
 
-#if !MOONLIGHT
+#if !MOONLIGHT && !MONODROID
                ExecutionScope (CompilationContext context, int compilation_unit)
                {
                        this.context = context;
@@ -68,7 +68,7 @@ namespace System.Runtime.CompilerServices {
 #endif
                public Delegate CreateDelegate (int indexLambda, object [] locals)
                {
-#if MOONLIGHT
+#if MOONLIGHT || MONODROID
                        throw new NotSupportedException ();
 #else
                        return context.CreateDelegate (
@@ -79,7 +79,7 @@ namespace System.Runtime.CompilerServices {
 
                public object [] CreateHoistedLocals ()
                {
-#if MOONLIGHT
+#if MOONLIGHT || MONODROID
                        throw new NotSupportedException ();
 #else
                        return context.CreateHoistedLocals (compilation_unit);
@@ -88,7 +88,7 @@ namespace System.Runtime.CompilerServices {
 
                public Expression IsolateExpression (Expression expression, object [] locals)
                {
-#if MOONLIGHT
+#if MOONLIGHT || MONODROID
                        throw new NotSupportedException ();
 #else
                        return context.IsolateExpression (this, locals, expression);

diff --git a/mcs/class/System.Core/mobile_System.Core.dll.sources b/mcs/class/System.Core/mobile_System.Core.dll.sources
index 3769602608210380ce54cbba102aac993e80480f..9ecddc135637af5a770890fdc0786123860555cb 100644 (file)
--- a/mcs/class/System.Core/mobile_System.Core.dll.sources
+++ b/mcs/class/System.Core/mobile_System.Core.dll.sources
@@ -36,34 +36,6 @@ System.Linq/SortContext.cs
 System.Linq/SortDirection.cs
 System.Linq/SortSequenceContext.cs
 System.Linq/IQueryProvider.cs
-System.Linq.Expressions/BinaryExpression.cs
-System.Linq.Expressions/ConditionalExpression.cs
-System.Linq.Expressions/ConstantExpression.cs
-System.Linq.Expressions/ElementInit.cs
-System.Linq.Expressions/EmitContext.cs
-System.Linq.Expressions/Expression.cs
-System.Linq.Expressions/Expression_T.cs
-System.Linq.Expressions/ExpressionPrinter.cs
-System.Linq.Expressions/ExpressionType.cs
-System.Linq.Expressions/ExpressionVisitor.cs
-System.Linq.Expressions/ExpressionTransformer.cs
-System.Linq.Expressions/Extensions.cs
-System.Linq.Expressions/InvocationExpression.cs
-System.Linq.Expressions/LambdaExpression.cs
-System.Linq.Expressions/ListInitExpression.cs
-System.Linq.Expressions/MemberAssignment.cs
-System.Linq.Expressions/MemberBinding.cs
-System.Linq.Expressions/MemberBindingType.cs
-System.Linq.Expressions/MemberExpression.cs
-System.Linq.Expressions/MemberInitExpression.cs
-System.Linq.Expressions/MemberListBinding.cs
-System.Linq.Expressions/MemberMemberBinding.cs
-System.Linq.Expressions/MethodCallExpression.cs
-System.Linq.Expressions/NewArrayExpression.cs
-System.Linq.Expressions/NewExpression.cs
-System.Linq.Expressions/ParameterExpression.cs
-System.Linq.Expressions/TypeBinaryExpression.cs
-System.Linq.Expressions/UnaryExpression.cs
 System.Collections.Generic/HashSet.cs
 ../corlib/System.Collections.Generic/CollectionDebuggerView.cs
 System.Security.Cryptography/Aes.cs
@@ -133,4 +105,4 @@ System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs
 Microsoft.Win32.SafeHandles/SafeMemoryMappedFileHandle.cs
 Microsoft.Win32.SafeHandles/SafeMemoryMappedViewHandle.cs
 System.IO/HandleInheritability.cs
-System.Threading.Tasks/TaskExtensions.cs
\ No newline at end of file
+System.Threading.Tasks/TaskExtensions.cs

diff --git a/mcs/class/System.Core/monodroid_System.Core.dll.sources b/mcs/class/System.Core/monodroid_System.Core.dll.sources
index 36b78e4db4b6b4a162fca28aa58dc69de15c30f1..f2a77782d886ae035adbd52acef1f9d6e0dba646 100644 (file)
--- a/mcs/class/System.Core/monodroid_System.Core.dll.sources
+++ b/mcs/class/System.Core/monodroid_System.Core.dll.sources
@@ -1,2 +1,3 @@
 #include mobile_System.Core.dll.sources
+#include dynamic_System.Core.dll.sources
 System/TimeZoneInfo.Android.cs

diff --git a/mcs/class/System.Core/monotouch_System.Core.dll.sources b/mcs/class/System.Core/monotouch_System.Core.dll.sources
index f8de2aacb32070bc238834b7057e4219dad1cbf4..4d431c73ccd915162f870faa0d8a84881874ddb1 100644 (file)
--- a/mcs/class/System.Core/monotouch_System.Core.dll.sources
+++ b/mcs/class/System.Core/monotouch_System.Core.dll.sources
@@ -1,4 +1,5 @@
 #include mobile_System.Core.dll.sources
+#include static_System.Core.dll.sources
 System.Linq.jvm/Conversion.cs
 System.Linq.jvm/ExpressionInterpreter.cs
 System.Linq.jvm/Runner.cs