|
11 | 11 | <JavaCPath Condition=" '$(JavaCPath)' == '' ">$(JavaSdkDirectory)\bin\javac</JavaCPath>
|
12 | 12 | </PropertyGroup>
|
13 | 13 | </Target>
|
| 14 | + <Target Name="_GetJavaInteropJarPath"> |
| 15 | + <PropertyGroup> |
| 16 | + <_JIJar_InTree>$([System.IO.Path]::GetFullPath ('$(XAInstallPrefix)'))\xbuild\Xamarin\Android\java-interop.jar</_JIJar_InTree> |
| 17 | + <_JIJar_System Condition=" '$(_XamarinAndroidMSBuildDirectory)' != '' ">$(_XamarinAndroidMSBuildDirectory)\java-interop.jar</_JIJar_System> |
| 18 | + <_JavaInteropJarPath Condition=" Exists($(_JIJar_InTree)) ">$(_JIJar_InTree)</_JavaInteropJarPath> |
| 19 | + <_JavaInteropJarPath Condition=" '$(_JavaInteropJarPath)' == '' ">$(_JIJar_System)</_JavaInteropJarPath> |
| 20 | + </PropertyGroup> |
| 21 | + <Error |
| 22 | + Condition=" '$(_JavaInteropJarPath)' == '' " |
| 23 | + Text="Could not determine path to `java-interop.jar`." |
| 24 | + /> |
| 25 | + </Target> |
14 | 26 | <Target Name="BuildTestJarFile"
|
15 |
| - DependsOnTargets="_GetJavacVersions" |
| 27 | + DependsOnTargets="_GetJavacVersions;_GetJavaInteropJarPath" |
16 | 28 | Inputs="@(TestJarEntry)"
|
17 | 29 | Outputs="%(TestJarEntry.OutputFile)">
|
18 | 30 | <ItemGroup>
|
|
26 | 38 | <_Targets>-source $(_JavacSourceVersion) -target $(_JavacTargetVersion)</_Targets>
|
27 | 39 | <_DestDir>$(IntermediateOutputPath)__CreateTestJarFile-bin</_DestDir>
|
28 | 40 | <_AndroidJar>-bootclasspath "$(AndroidSdkDirectory)\platforms\android-$(_AndroidApiLevelName)\android.jar"</_AndroidJar>
|
29 |
| - <_JIJar_InTree>$([System.IO.Path]::GetFullPath ('$(XAInstallPrefix)'))\xbuild\Xamarin\Android\java-interop.jar</_JIJar_InTree> |
30 |
| - <_JIJar_System>$(MSBuildExtensionsPath)\Xamarin\Android\java-interop.jar</_JIJar_System> |
31 |
| - <_JIJar Condition=" Exists ($(_JIJar_InTree)) ">$(_JIJar_InTree)</_JIJar> |
32 |
| - <_JIJar Condition=" '$(_JIJar)' == '' ">$(_JIJar_System)</_JIJar> |
33 |
| - <_CP>-cp "$(_JIJar)"</_CP> |
| 41 | + <_CP>-cp "$(_JavaInteropJarPath)"</_CP> |
34 | 42 | </PropertyGroup>
|
35 | 43 | <MakeDir Directories="$(_DestDir)" />
|
36 | 44 | <Exec Command="$(_Javac) $(_Targets) -d "$(_DestDir)" $(_AndroidJar) $(_CP) @(_JavacSource->'"%(Identity)"', ' ')" />
|
|
0 commit comments