Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium 2
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
poka
Cesium 2
Commits
8f3a17c1
Commit
8f3a17c1
authored
5 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Fix android build doc
parent
4e04fe68
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+3
-1
3 additions, 1 deletion
.gitignore
.local/env.sh
+0
-11
0 additions, 11 deletions
.local/env.sh
release.sh
+4
-3
4 additions, 3 deletions
release.sh
with
7 additions
and
15 deletions
.gitignore
+
3
−
1
View file @
8f3a17c1
...
...
@@ -36,5 +36,7 @@ UserInterfaceState.xcuserstate
yarn.lock
.directory
/.local
.local
.local/env.sh
.local/android
package-lock.json
This diff is collapsed.
Click to expand it.
.local/env.sh
deleted
100755 → 0
+
0
−
11
View file @
4e04fe68
#!/bin/bash
export
ANDROID_NDK_VERSION
=
r19c
export
ANDROID_SDK_VERSION
=
r29.0.0
export
ANDROID_SDK_TOOLS_VERSION
=
4333796
#JAVA_HOME=/
export
ANDROID_SDK_ROOT
=
/usr/lib/android-sdk
export
ANDROID_SDK_TOOLS_ROOT
=
${
ANDROID_SDK_ROOT
}
/build-tools
export
PATH
=
${
ANDROID_SDK_TOOLS_ROOT
}
/tools/bin:
$PATH
This diff is collapsed.
Click to expand it.
release.sh
+
4
−
3
View file @
8f3a17c1
...
...
@@ -66,13 +66,14 @@ rel|pre)
esac
# Check the Java version
JAVA_VERSION
=
`
java
-version
2>&1 |
grep
"java version"
|
awk
'{print $3}'
|
tr
-d
\"
`
JAVA_VERSION
=
`
java
-version
2>&1 |
e
grep
"
(
java
|openjdk)
version"
|
awk
'{print $3}'
|
tr
-d
\"
`
if
[[
$?
-ne
0
]]
;
then
echo
"No Java JRE 1.8 found in machine. This is required for Android artifacts."
exit
-1
fi
JAVA_MINOR_VERSION
=
`
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[2]}'
`
if
[[
${
JAVA_MINOR_VERSION
}
-ne
8
]]
;
then
JAVA_MAJOR_VERSION
=
`
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[1]}'
`
fiJAVA_MINOR_VERSION
=
`
echo
${
JAVA_VERSION
}
|
awk
'{split($0, array, ".")} END{print array[2]}'
`
if
[[
${
JAVA_MAJOR_VERSION
}
-ne
1
]]
||
[[
${
JAVA_MINOR_VERSION
}
-ne
8
]]
;
then
echo
"Require a Java JRE in version 1.8, but found
${
JAVA_VERSION
}
. You can override your default JAVA_HOME in 'env.sh'."
exit
-1
fi
...
...
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