Skip to content

Commit 80667c4

Browse files
[Android][Docker] Upgrade Android API level 30 to 34 (project-chip#40615)
Fix SDK Platform 34 download link
1 parent 325fbbd commit 80667c4

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
162 : Remove OpenIOTSdk
1+
163 : Upgraded from API 30 to API 34

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ RUN set -x \
1313

1414
# Download and install android SDK
1515
RUN set -x \
16-
&& wget -O /tmp/android-30.zip https://dl.google.com/android/repository/platform-30_r03.zip \
16+
&& wget -O /tmp/android-34.zip https://dl.google.com/android/repository/platform-34-ext7_r03.zip \
1717
&& mkdir -p /opt/android/sdk/platforms \
1818
&& cd /opt/android/sdk/platforms \
19-
&& unzip /tmp/android-30.zip \
20-
&& mv android-11 android-30 \
21-
&& rm -f /tmp/android-30.zip \
19+
&& unzip /tmp/android-34.zip \
20+
&& rm -f /tmp/android-34.zip \
2221
&& chmod -R a+rX /opt/android/sdk \
23-
&& test -d /opt/android/sdk/platforms/android-30 \
22+
&& test -d /opt/android/sdk/platforms/android-34 \
2423
&& : # last line
2524

2625
# Download and install android command line tool (for installing `sdkmanager`)
@@ -61,9 +60,9 @@ RUN set -x \
6160
&& export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
6261
&& cd /tmp && wget https://www.openssl.org/source/openssl-1.1.1t.tar.gz \
6362
&& mkdir -p $OPENSSL_ARMV7 && cd $OPENSSL_ARMV7 && tar xfz /tmp/openssl-1.1.1t.tar.gz \
64-
&& cd $OPENSSL_ARMV7/openssl-1.1.1t && CC=clang ANDROID_API=26 ./Configure android-arm -U__ANDROID_API__ -D__ANDROID_API__=26 && make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
63+
&& cd $OPENSSL_ARMV7/openssl-1.1.1t && CC=clang ANDROID_API=34 ./Configure android-arm -U__ANDROID_API__ -D__ANDROID_API__=34 && make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
6564
&& mkdir -p $OPENSSL_X86 && cd $OPENSSL_X86 && tar xfz /tmp/openssl-1.1.1t.tar.gz \
66-
&& cd $OPENSSL_X86/openssl-1.1.1t && CC=clang ANDROID_API=26 ./Configure android-x86 -U__ANDROID_API__ -D__ANDROID_API__=26 && make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
65+
&& cd $OPENSSL_X86/openssl-1.1.1t && CC=clang ANDROID_API=34 ./Configure android-x86 -U__ANDROID_API__ -D__ANDROID_API__=34 && make -j$(nproc) SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
6766
&& rm -rf /tmp/openssl-1.1.1t.tar.gz \
6867
&& : # last line
6968

0 commit comments

Comments
 (0)