File tree 3 files changed +10
-5
lines changed
integrations/docker/images
stage-3/chip-build-android
3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change 1
- 105 : Upgrade android docker with new kotlin/gradle
1
+ 106 : Upgrade android docker with java 17 and adjust the location for android cmdline tool
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-17 -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_PATH=/usr/lib/jvm/java-11 -openjdk-amd64
23
+ ENV JAVA_PATH=/usr/lib/jvm/java-17 -openjdk-amd64
Original file line number Diff line number Diff line change @@ -27,11 +27,16 @@ RUN set -x \
27
27
&& : # last line
28
28
29
29
# 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
31
+ # when running sdkmanager --licenses
30
32
RUN set -x \
31
33
&& wget -O /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
32
34
&& cd /opt/android/sdk \
33
- && unzip /tmp/cmdline-tools.zip \
34
- && rm -f /tmp/cmdline-tools.zip \
35
+ && mkdir -p temp \
36
+ && unzip /tmp/cmdline-tools.zip -d temp \
37
+ && mkdir -p cmdline-tools/latest \
38
+ && cp -rf temp/cmdline-tools/* cmdline-tools/latest \
39
+ && rm -rf temp \
35
40
&& test -d /opt/android/sdk/cmdline-tools \
36
41
&& : # last line
37
42
You can’t perform that action at this time.
0 commit comments