From 26cfeec7bc592c78452fa75b7e018930db4a15e0 Mon Sep 17 00:00:00 2001
From: yunhanw <yunhanw@google.com>
Date: Fri, 7 Feb 2025 08:13:51 -0800
Subject: [PATCH] decouple java docker from android docker

---
 integrations/docker/images/base/chip-build/version            | 2 +-
 integrations/docker/images/stage-2/chip-build-java/Dockerfile | 4 ++--
 .../docker/images/stage-3/chip-build-android/Dockerfile       | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index 0ff86b56e79125..830f4fc8b8fb4b 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-111 : [Android] Update android sdk and java version
+112 : [Android] set java 8 for java docker
diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile
index c5b54e4c439f8e..3cf226efa86205 100644
--- a/integrations/docker/images/stage-2/chip-build-java/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
-    openjdk-11-jdk \
+    openjdk-8-jdk \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line
 
@@ -20,4 +20,4 @@ RUN set -x \
     && : # last line
 
 ENV PATH $PATH:/usr/lib/kotlinc/bin
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile
index eb2360ccb937e0..ee2a2d55fb2fd1 100644
--- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile
+++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile
@@ -2,9 +2,6 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build-java:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
-# JDK 8 access
-# JDK 8 is required because Android `sdkmanager`
-# doesn't work with JDK 11.
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
@@ -72,3 +69,4 @@ RUN set -x \
 
 ENV ANDROID_HOME=/opt/android/sdk
 ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64