Skip to content

Commit c9c4e3c

Browse files
jonathanpeppersjonathanpeppers
committed
[build] option for Java.Interop to be built as non-PCL (#360)
* [build] option for Java.Interop to be built as non-PCL Fixes: http://work.devdiv.io/667174 When building a "Hello World" Xamarin.Android app, I noticed the following in the build log: Adding assembly reference for Java.Interop, Version=0.1.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, recursively... Adding assembly reference for System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, recursively... Adding assembly reference for System.Diagnostics.Debug, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Threading, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Collections, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Collections.Concurrent, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Reflection, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Linq.Expressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Dynamic.Runtime, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.ObjectModel, Version=4.0.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Linq, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, recursively... Adding assembly reference for Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, recursively... It appears that Java.Interop is a PCL, and we end up having to work with lots of facade assemblies during our build! My thought is that we should build `Java.Interop.dll` the same as `Mono.Android.dll`: <PropertyGroup> <NoStdLib>true</NoStdLib> </PropertyGroup> <ItemGroup> <Reference Include="mscorlib"> <HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System"> <HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System.Core"> <HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.Core.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> I added a new property, `$(JavaInteropProfile)` we can set downstream in Xamarin.Android. We can set this with a `Configuration.Override.props` file that is already used in Xamarin.Android's build process. After doing this, the log now reads: Adding assembly reference for Java.Interop, Version=0.1.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, recursively... Adding assembly reference for Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, recursively... And the savings in build times for "Hello World", this is the `Rebuild` target: - `Debug` + PCL - 8.424s - `Release` + PCL - 13.651s - `Debug` + *not* PCL - 4.258s - `Release` + *not PCL - 9.487s That does bring up a big question, however... Why are facade assemblies adding so much build time??? This change is good: making `Java.Interop` have fewer dependencies. But I suspect there is more work to be done downstream in Xamarin.Android. I have a feeling referencing `netstandard` libraries cause the same problem to occur. * [build] $(JavaInteropProfile) now outputs to $(Configuration)Net45 folder This allows us to have two sets of outputs: - bin/Debug/Java.Interop.dll - referenced by MSBuild tasks - bin/DebugNet45/Java.Interop.dll - referenced by Mono.Android.dll and apps Other changes: - Fixed warning where file was getting imported twice - Updated `.gitignore` for `*.binlog` files * Whoops doc XML file was missing
1 parent b873e81 commit c9c4e3c

File tree

5 files changed

+38
-4
lines changed

5 files changed

+38
-4
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ packages
1111
.nuget/
1212
*.userprefs
1313
*.user
14-
Resource.designer.cs
14+
Resource.designer.cs
15+
*.binlog

‎src/Java.Interop/Java.Interop.Net45.props‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project>
2+
<PropertyGroup>
3+
<NoStdLib Condition=" '$(XAInstallPrefix)' != '' ">true</NoStdLib>
4+
<OutputPath>..\..\bin\$(Configuration)Net45</OutputPath>
5+
<DocumentationFile>$(OutputPath)\Java.Interop.xml</DocumentationFile>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
8+
<ItemGroup Condition=" '$(XAInstallPrefix)' != '' ">
9+
<Reference Include="mscorlib">
10+
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\mscorlib.dll</HintPath>
11+
<Private>False</Private>
12+
</Reference>
13+
<Reference Include="System">
14+
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.dll</HintPath>
15+
<Private>False</Private>
16+
</Reference>
17+
<Reference Include="System.Core">
18+
<HintPath>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\System.Core.dll</HintPath>
19+
<Private>False</Private>
20+
</Reference>
21+
</ItemGroup>
22+
<ItemGroup Condition=" '$(XAInstallPrefix)' == '' ">
23+
<Reference Include="mscorlib" />
24+
<Reference Include="System" />
25+
<Reference Include="System.Core" />
26+
</ItemGroup>
27+
</Project>

‎src/Java.Interop/Java.Interop.PCL.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
4+
</PropertyGroup>
5+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
6+
</Project>

‎src/Java.Interop/Java.Interop.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<OutputType>Library</OutputType>
1111
<RootNamespace>Java.Interop</RootNamespace>
1212
<AssemblyName>Java.Interop</AssemblyName>
13-
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
1413
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1514
<NoWarn>1591</NoWarn>
1615
<SignAssembly>true</SignAssembly>
@@ -151,7 +150,9 @@
151150
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\GCUserPeerable.java" />
152151
<CompileJavaInteropJar Include="java\com\xamarin\java_interop\ManagedPeer.java" />
153152
</ItemGroup>
154-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
153+
<Import Project="..\..\Configuration.props" />
154+
<Import Project="Java.Interop.PCL.props" Condition=" '$(JavaInteropProfile)' != 'net45' " />
155+
<Import Project="Java.Interop.Net45.props" Condition=" '$(JavaInteropProfile)' == 'net45' " />
155156
<Import Project="Java.Interop.targets" />
156157
<PropertyGroup>
157158
<BuildDependsOn>

‎src/Java.Interop/Java.Interop.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<Runtime Condition="'$(OS)' != 'Windows_NT'">mono</Runtime>
55
</PropertyGroup>
6-
<Import Project="$(JNIEnvGenPath)\JdkInfo.props" />
76
<Target Name="BuildJnienvGen"
87
Inputs="..\..\build-tools\jnienv-gen\jnienv-gen.csproj"
98
Outputs="$(JNIEnvGenPath)\jnienv-gen.exe">

0 commit comments

Comments
 (0)