-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
[build] add dependencies for bulding Android App #3336
Merged
rwalker-apple
merged 8 commits into
project-chip:master
from
wgtdkp:update-android-docker
Oct 26, 2020
Merged
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 c3d8fee
update comments
wgtdkp 86d1c09
fix cirque test
wgtdkp 679abd0
Update version
mspang dc3f192
remove JDK 11
wgtdkp 5d1d26d
Update run.sh
mspang dddd70d
revert changes to docker run scripts
wgtdkp abf6bae
update version of only chip-build-android docker image
wgtdkp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 \ | ||
&& rm -rf /var/lib/apt/lists/ \ | ||
&& : # last line | ||
|
||
|
@@ -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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need |
||
# Download and install android NDK | ||
RUN set -x \ | ||
&& cd /tmp \ | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
0.4.13 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.