Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Docker containers to Android SDK 26 #25867

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Update Docker containers to Android SDK 26 #25867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update Docker containers to Android SDK 26
  • Loading branch information
@mwswartwout
mwswartwout committed Mar 28, 2023
commit 2fef4798514774e75b4d1ff0a860519f57985d58
14 changes: 7 additions & 7 deletions integrations/docker/images/chip-build-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ RUN set -x \

# Download and install android SDK
RUN set -x \
&& wget -O /tmp/android-21.zip https://dl.google.com/android/repository/android-21_r02.zip \
&& wget -O /tmp/android-26.zip https://dl.google.com/android/repository/platform-26_r02.zip \
&& mkdir -p /opt/android/sdk/platforms \
&& cd /opt/android/sdk/platforms \
&& unzip /tmp/android-21.zip \
&& mv android-5.0.1 android-21 \
&& rm -f /tmp/android-21.zip \
&& unzip /tmp/android-26.zip \
&& mv android-8.0.0 android-26 \
&& rm -f /tmp/android-26.zip \
&& chmod -R a+rX /opt/android/sdk \
&& test -d /opt/android/sdk/platforms/android-21 \
&& test -d /opt/android/sdk/platforms/android-26 \
&& : # last line

# Download and install android command line tool (for installing `sdkmanager`)
Expand Down Expand Up @@ -57,9 +57,9 @@ RUN set -x \
&& export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
&& cd /tmp && wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz \
&& mkdir -p $OPENSSL_ARMV7 && cd $OPENSSL_ARMV7 && tar xfz /tmp/openssl-1.1.1g.tar.gz \
&& cd $OPENSSL_ARMV7/openssl-1.1.1g && CC=clang ANDROID_API=21 ./Configure android-arm -D__ANDROID_API__=21 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
&& cd $OPENSSL_ARMV7/openssl-1.1.1g && CC=clang ANDROID_API=26 ./Configure android-arm -D__ANDROID_API__=26 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
&& mkdir -p $OPENSSL_X86 && cd $OPENSSL_X86 && tar xfz /tmp/openssl-1.1.1g.tar.gz \
&& cd $OPENSSL_X86/openssl-1.1.1g && CC=clang ANDROID_API=21 ./Configure android-x86 -D__ANDROID_API__=21 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
&& cd $OPENSSL_X86/openssl-1.1.1g && CC=clang ANDROID_API=26 ./Configure android-x86 -D__ANDROID_API__=26 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
&& rm -rf /tmp/OpenSSL_1_1_1g.zip \
&& : # last line

Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.50 Version bump reason: [Silabs] Update Image with GSDK and SLC
0.6.51 Version bump reason: Update to Android SDK 26