File tree 3 files changed +4
-6
lines changed
integrations/docker/images
stage-3/chip-build-android
3 files changed +4
-6
lines changed Original file line number Diff line number Diff line change 1
- 111 : [Android] Update android sdk and java version
1
+ 112 : [Android] set java 9 for java docker
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
6
6
RUN set -x \
7
7
&& apt-get update \
8
8
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
9
- openjdk-11 -jdk \
9
+ openjdk-8 -jdk \
10
10
&& rm -rf /var/lib/apt/lists/ \
11
11
&& : # last line
12
12
@@ -20,4 +20,4 @@ RUN set -x \
20
20
&& : # last line
21
21
22
22
ENV PATH $PATH:/usr/lib/kotlinc/bin
23
- ENV JAVA_HOME=/usr/lib/jvm/java-11 -openjdk-amd64
23
+ ENV JAVA_HOME=/usr/lib/jvm/java-8 -openjdk-amd64
Original file line number Diff line number Diff line change @@ -2,9 +2,6 @@ ARG VERSION=1
2
2
FROM ghcr.io/project-chip/chip-build-java:${VERSION}
3
3
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
4
4
5
- # JDK 8 access
6
- # JDK 8 is required because Android `sdkmanager`
7
- # doesn't work with JDK 11.
8
5
RUN set -x \
9
6
&& apt-get update \
10
7
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
@@ -72,3 +69,4 @@ RUN set -x \
72
69
73
70
ENV ANDROID_HOME=/opt/android/sdk
74
71
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
72
+ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
You can’t perform that action at this time.
0 commit comments