Merge pull request #52 from jonpryor/jonp-app-java-class

[Xamarin.Android.Build.Tasks] Support MultiDexApplication

Author: atsushieno

external/Java.Interop

@@ -12,12 +12,12 @@ namespace Xamarin.Android.Tasks
 {
 	class Generator
 	{
-		public static bool CreateJavaSources (TaskLoggingHelper log, IEnumerable<TypeDefinition> javaTypes, string outputPath, bool useSharedRuntime, bool generateOnCreateOverrides, bool hasExportReference)
+		public static bool CreateJavaSources (TaskLoggingHelper log, IEnumerable<TypeDefinition> javaTypes, string outputPath, string applicationJavaClass, bool useSharedRuntime, bool generateOnCreateOverrides, bool hasExportReference)
 		{
 			bool ok = true;
 			foreach (var t in javaTypes) {
 				try {
-					GenerateJavaSource (log, t, outputPath, useSharedRuntime, generateOnCreateOverrides, hasExportReference);
+					GenerateJavaSource (log, t, outputPath, applicationJavaClass, useSharedRuntime, generateOnCreateOverrides, hasExportReference);
 				} catch (XamarinAndroidException xae) {
 					ok = false;
 					log.LogError (
@@ -37,12 +37,13 @@ public static bool CreateJavaSources (TaskLoggingHelper log, IEnumerable<TypeDef
 			return ok;
 		}
 
-		static void GenerateJavaSource (TaskLoggingHelper log, TypeDefinition t, string outputPath, bool useSharedRuntime, bool generateOnCreateOverrides, bool hasExportReference)
+		static void GenerateJavaSource (TaskLoggingHelper log, TypeDefinition t, string outputPath, string applicationJavaClass, bool useSharedRuntime, bool generateOnCreateOverrides, bool hasExportReference)
 		{
 			try {
 				var jti = new JavaCallableWrapperGenerator (t, log.LogWarning) {
 					UseSharedRuntime = useSharedRuntime,
 					GenerateOnCreateOverrides = generateOnCreateOverrides,
+					ApplicationJavaClass        = applicationJavaClass,
 				};
 
 				jti.Generate (outputPath);

src/Xamarin.Android.Build.Tasks/Generator/Generator.cs

@@ -128,6 +128,7 @@ void Run ()
 				Log,
 				java_types,
 				temp,
+				ApplicationJavaClass,
 				UseSharedRuntime,
 				int.Parse (AndroidSdkPlatform) <= 10,
 				ResolvedAssemblies.Any (assembly => Path.GetFileName (assembly.ItemSpec) == "Mono.Android.Export.dll"));