Skip to content

Commit ff5f8fd

Browse files
[Android][Docker]upgrade android sdk from 8 to 11 with java 11 support (#37444)
* upgrade android sd to android 11 with java 11 support * Update Dockerfile --------- Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent f53be4f commit ff5f8fd

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
110 : [Tizen] Add zstd to base image
1+
111 : [Android] Update android sdk and java version

integrations/docker/images/stage-2/chip-build-java/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
66
RUN set -x \
77
&& apt-get update \
88
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
9-
openjdk-17-jdk \
9+
openjdk-11-jdk \
1010
&& rm -rf /var/lib/apt/lists/ \
1111
&& : # last line
1212

@@ -20,4 +20,4 @@ RUN set -x \
2020
&& : # last line
2121

2222
ENV PATH $PATH:/usr/lib/kotlinc/bin
23-
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
23+
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64

integrations/docker/images/stage-3/chip-build-android/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ RUN set -x \
1616

1717
# Download and install android SDK
1818
RUN set -x \
19-
&& wget -O /tmp/android-26.zip https://dl.google.com/android/repository/platform-26_r02.zip \
19+
&& wget -O /tmp/android-30.zip https://dl.google.com/android/repository/platform-30_r03.zip \
2020
&& mkdir -p /opt/android/sdk/platforms \
2121
&& cd /opt/android/sdk/platforms \
22-
&& unzip /tmp/android-26.zip \
23-
&& mv android-8.0.0 android-26 \
24-
&& rm -f /tmp/android-26.zip \
22+
&& unzip /tmp/android-30.zip \
23+
&& mv android-11 android-30 \
24+
&& rm -f /tmp/android-30.zip \
2525
&& chmod -R a+rX /opt/android/sdk \
26-
&& test -d /opt/android/sdk/platforms/android-26 \
26+
&& test -d /opt/android/sdk/platforms/android-30 \
2727
&& : # last line
2828

2929
# Download and install android command line tool (for installing `sdkmanager`)
30-
# We need create latest folder inide cmdline-tools, since latest android commandline tool looks for this latest folder
30+
# We need create 10.0 folder inide cmdline-tools, since latest android commandline tool looks for this latest folder
3131
# when running sdkmanager --licenses
3232
RUN set -x \
33-
&& wget -O /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
33+
&& wget -O /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip \
3434
&& cd /opt/android/sdk \
3535
&& mkdir -p temp \
3636
&& unzip /tmp/cmdline-tools.zip -d temp \
37-
&& mkdir -p cmdline-tools/latest \
38-
&& cp -rf temp/cmdline-tools/* cmdline-tools/latest \
37+
&& mkdir -p cmdline-tools/10.0 \
38+
&& cp -rf temp/cmdline-tools/* cmdline-tools/10.0 \
3939
&& rm -rf temp \
4040
&& test -d /opt/android/sdk/cmdline-tools \
4141
&& : # last line

0 commit comments

Comments
 (0)