Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Docker Android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zandor Smith
Docker Android
Commits
50798983
Unverified
Commit
50798983
authored
2 years ago
by
Nicola Corti
Browse files
Options
Downloads
Patches
Plain Diff
Add CMake 3.22.1 to the container (#192)
parent
a9ec4f39
Branches
release/v6.x
Tags
v6.2
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+5
-1
5 additions, 1 deletion
Dockerfile
with
5 additions
and
1 deletion
Dockerfile
+
5
−
1
View file @
50798983
...
...
@@ -21,7 +21,10 @@ ARG NDK_VERSION_BUCK=21.4.7075529
ARG
NDK_VERSION_GRADLE=23.1.7779620
ARG
NODE_VERSION=14.x
ARG
WATCHMAN_VERSION=4.9.0
ARG
CMAKE_VERSION=3.18.1
# For comaptibilites we install both CMake 3.18.x and 3.22.x, as AGP 7.3 autodownloads 3.18.x
# Once we bump to AGP 7.4, we can remove 3.18.x and use only 3.22.x
ARG
CMAKE_VERSION=3.22.1
ARG
OLD_CMAKE_VERSION=3.18.1
# set default environment variables, please don't remove old env for compatibilty issue
ENV
ADB_INSTALL_TIMEOUT=10
...
...
@@ -115,6 +118,7 @@ RUN curl -sS https://dl.google.com/android/repository/${SDK_VERSION} -o /tmp/sdk
"build-tools;
$ANDROID_TOOLS_VERSION
"
\
"build-tools;
$ANDROID_TOOLS_VERSION_FALLBACK
"
\
"cmake;
$CMAKE_VERSION
"
\
"cmake;
$OLD_CMAKE_VERSION
"
\
"system-images;android-21;google_apis;armeabi-v7a"
\
"ndk;
$NDK_VERSION_BUCK
"
\
"ndk;
$NDK_VERSION_GRADLE
"
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment