[java-runtime] Remove debug files from java_runtime.jar (#2870)

dellis1972 · jonpryor · commit 75023bd23050 · 2019-03-25T13:57:28.000-04:00
Commit 121b81a added the new `java_runtime.jar` and `java_runtime_fastdev.jar` files. The idea is that `java_runtime.jar` was the release version of the runtime, and would *not* contain files such as mono/android/ResourcePatcher.class mono/android/Seppuku.class mono/android/MonkeyPatcher.class which are for fast dev only. However we were including these files!! This was because of a couple of problems. 1. The `%(_RuntimeOutput.RemoveItems)` metadata was being treated like an ItemGroup when it is in fact a property. Wwe need to semi-colon `;`-separate the items to make sure they are ALL removed rather then it just being the last one listed. 2. Because the `Inputs` was changed to `@(_RuntimeOutput)` it means the target will run only ONCE. As a result both the `release.txt` and `fastdev.txt` files contained the SAME file list. What we should have been doing was using Target Batching: %(_RuntimeOutput.OutputJar) This makes sure the target runs for EACH output. This will result in the behaviour we want, i.e the files listed above NOT being in the release version of the jar. Finally, change the default value for `MonoPackageManager_Resources.ApiPackageName` from `""` (empty string) to `null`. This was done to allow startup to work; otherwise, [`MonoRuntimeProvider.attachInfo()` could fail][0] if it encounters a non-`null` value which *isn't* an installed package. We don't yet fully understand this failure scenario, but setting `ApiPackageName` to null allows things to work. [0]: https://github.com/xamarin/xamarin-android/blob/ae75aa627de475a5c276ccbc60e9e9f72425aab0/src/Xamarin.Android.Build.Tasks/Resources/MonoRuntimeProvider.Shared.java#L23-L39
diff --git a/src/java-runtime/java-runtime.targets b/src/java-runtime/java-runtime.targets
@@ -6,10 +6,7 @@
     <OutputDex>$(OutputPath)java_runtime.dex</OutputDex>
     <IntermediateRuntimeOutputPath>$(IntermediateOutputPath)release</IntermediateRuntimeOutputPath>
     <IntermediateRuntimeClassesTxt>$(IntermediateOutputPath)release.txt</IntermediateRuntimeClassesTxt>
-    <RemoveItems>java\mono\android\debug\MultiDexLoader.java</RemoveItems>
-    <RemoveItems>java\mono\android\MonkeyPatcher.java</RemoveItems>
-    <RemoveItems>java\mono\android\ResourcePatcher.java</RemoveItems>
-    <RemoveItems>java\mono\android\Seppuku.java</RemoveItems>
+    <RemoveItems>java\mono\android\debug\MultiDexLoader.java;java\mono\android\MonkeyPatcher.java;java\mono\android\ResourcePatcher.java;java\mono\android\Seppuku.java</RemoveItems>
   </_RuntimeOutput>
   <_RuntimeOutput Include="$(OutputPath)java_runtime_fastdev.jar">
     <OutputJar>$(OutputPath)java_runtime_fastdev.jar</OutputJar>
@@ -21,7 +18,7 @@
 </ItemGroup>
 <Target Name="Build" 
       Inputs="@(AllRuntimeSource)"
-      Outputs="@(_RuntimeOutput)"
+      Outputs="%(_RuntimeOutput.OutputJar)"
 >
   <MakeDir Directories="%(_RuntimeOutput.IntermediateRuntimeOutputPath)" />
   <MakeDir Directories="$(OutputPath)" />
diff --git a/src/java-runtime/java/mono/android/MonoPackageManager.java b/src/java-runtime/java/mono/android/MonoPackageManager.java
@@ -106,11 +106,4 @@ public static String getApiPackageName ()
 		return MonoPackageManager_Resources.ApiPackageName;
 	}
 }
-class MonoPackageManager_Resources {
-	public static final String[] Assemblies = new String[]{
-	};
-	public static final String[] Dependencies = new String[]{
-	};
-	public static final String ApiPackageName = "";
-}
 
diff --git a/src/java-runtime/java/mono/android/MonoPackageManager_Resources.java b/src/java-runtime/java/mono/android/MonoPackageManager_Resources.java
@@ -0,0 +1,14 @@
+package mono;
+
+import java.lang.String;
+import java.util.Arrays;
+
+
+public class MonoPackageManager_Resources {
+	public static final String[] Assemblies = new String[]{
+	};
+	public static final String[] Dependencies = new String[]{
+	};
+	public static final String ApiPackageName = null;
+}
+

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,4 @@ public static String getApiPackageName ()`
`106`	`106`	`return MonoPackageManager_Resources.ApiPackageName;`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`-class MonoPackageManager_Resources {`
`110`		`- public static final String[] Assemblies = new String[]{`
`111`		`- };`
`112`		`- public static final String[] Dependencies = new String[]{`
`113`		`- };`
`114`		`- public static final String ApiPackageName = "";`
`115`		`-}`
`116`	`109`