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

[build] add dependencies for bulding Android App #3336

Merged
merged 8 commits into from
Oct 26, 2020
Merged

[build] add dependencies for bulding Android App #3336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b1abce
[build] add more dependencies for bulding Android App
wgtdkp Oct 20, 2020
c3d8fee
update comments
wgtdkp Oct 20, 2020
86d1c09
fix cirque test
wgtdkp Oct 20, 2020
679abd0
Update version
mspang Oct 20, 2020
dc3f192
remove JDK 11
wgtdkp Oct 21, 2020
5d1d26d
Update run.sh
mspang Oct 21, 2020
dddd70d
revert changes to docker run scripts
wgtdkp Oct 22, 2020
abf6bae
update version of only chip-build-android docker image
wgtdkp Oct 23, 2020
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
17 changes: 15 additions & 2 deletions integrations/docker/images/chip-build-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
ARG VERSION=latest
FROM connectedhomeip/chip-build:${VERSION}

# JDK 11 access
# 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 \
openjdk-11-jdk \
openjdk-8-jdk \
rsync \
swig \
Comment on lines +11 to +12
Copy link
Contributor Author

@wgtdkp wgtdkp Oct 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are required when building the Android App by following the README doc, Please also see the document-update PR #3334.

&& rm -rf /var/lib/apt/lists/ \
&& : # last line

Expand All @@ -21,6 +25,15 @@ RUN set -x \
&& test -d /opt/android/sdk/platforms/android-21 \
&& : # last line

# Download and install android command line tool (for installing `sdkmanager`)
RUN set -x \
&& wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip \
&& cd /opt/android/sdk \
&& unzip /tmp/android-tools.zip \
&& rm -f /tmp/android-tools.zip \
&& test -d /opt/android/sdk/tools \
&& : # last line

Comment on lines +28 to +36
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need sdkmanager to download Android SDKs and it comes with this Android SDK tool package.

# Download and install android NDK
RUN set -x \
&& cd /tmp \
Expand Down
1 change: 0 additions & 1 deletion integrations/docker/images/chip-build-android/version
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions integrations/docker/images/chip-build-android/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.4.13