Skip to content

Commit 021c4e9

Browse files
[build] use JDK 8 if JDK 9 is installed
Context: dotnet/java-interop#226 At the current time, we will not be able to use JDK 9 for Android. Some of our build agents (VSTS), now have JDK 9 installed, so we need to make a few changes to make sure JDK 8 is picked up instead. Changes: - Bump to java.interop/master/55c56f7 - Calls to `make -C external/Java.Interop` need to pass `JI_MAX_JDK=8`
1 parent d1bc533 commit 021c4e9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ prepare-external:
9090
nuget restore Xamarin.Android-Tests.sln
9191
$(foreach conf, $(CONFIGURATIONS), \
9292
(cd external/xamarin-android-tools && make prepare CONFIGURATION=$(conf)) && \
93-
(cd $(call GetPath,JavaInterop) && make prepare CONFIGURATION=$(conf)) && \
94-
(cd $(call GetPath,JavaInterop) && make bin/Build$(conf)/JdkInfo.props CONFIGURATION=$(conf)) && ) \
93+
(cd $(call GetPath,JavaInterop) && make prepare CONFIGURATION=$(conf) JI_MAX_JDK=8) && \
94+
(cd $(call GetPath,JavaInterop) && make bin/Build$(conf)/JdkInfo.props CONFIGURATION=$(conf) JI_MAX_JDK=8) && ) \
9595
true
9696

9797
prepare-deps: prepare-external

build-tools/scripts/RunTests.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Target Name="RunJavaInteropTests">
4646
<MSBuild Projects="$(JavaInteropSourceDirectory)\Java.Interop.sln" Condition=" '$(HostOS)' == 'Windows' " />
4747
<Exec
48-
Command ="make -C &quot;$(JavaInteropSourceDirectory)&quot; CONFIGURATION=$(Configuration) all"
48+
Command ="make -C &quot;$(JavaInteropSourceDirectory)&quot; CONFIGURATION=$(Configuration) all JI_MAX_JDK=8"
4949
Condition=" '$(HostOS)' != 'Windows' "
5050
/>
5151
<SetEnvironmentVariable Name="ANDROID_SDK_PATH" Value="$(AndroidSdkFullPath)" />

external/Java.Interop

0 commit comments

Comments
 (0)