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
Add compile android arm native lib #188
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
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
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,200 @@ | ||
#!/bin/bash | ||
|
||
DEFAULT_DOCKCROSS_IMAGE=dockcross/android-arm | ||
|
||
#------------------------------------------------------------------------------ | ||
# Helpers | ||
# | ||
err() { | ||
echo -e >&2 ERROR: $@\\n | ||
} | ||
|
||
die() { | ||
err $@ | ||
exit 1 | ||
} | ||
|
||
has() { | ||
# eg. has command update | ||
local kind=$1 | ||
local name=$2 | ||
|
||
type -t $kind:$name | grep -q function | ||
} | ||
|
||
#------------------------------------------------------------------------------ | ||
# Command handlers | ||
# | ||
command:update-image() { | ||
docker pull $FINAL_IMAGE | ||
} | ||
|
||
help:update-image() { | ||
echo Pull the latest $FINAL_IMAGE . | ||
} | ||
|
||
command:update-script() { | ||
if cmp -s <( docker run $FINAL_IMAGE ) $0; then | ||
echo $0 is up to date | ||
else | ||
echo -n Updating $0 '... ' | ||
docker run $FINAL_IMAGE > $0 && echo ok | ||
fi | ||
} | ||
|
||
help:update-image() { | ||
echo Update $0 from $FINAL_IMAGE . | ||
} | ||
|
||
command:update() { | ||
command:update-image | ||
command:update-script | ||
} | ||
|
||
help:update() { | ||
echo Pull the latest $FINAL_IMAGE, and then update $0 from that. | ||
} | ||
|
||
command:help() { | ||
if [[ $# != 0 ]]; then | ||
if ! has command $1; then | ||
err \"$1\" is not an dockcross command | ||
command:help | ||
elif ! has help $1; then | ||
err No help found for \"$1\" | ||
else | ||
help:$1 | ||
fi | ||
else | ||
cat >&2 <<ENDHELP | ||
Usage: dockcross [options] [--] command [args] | ||
|
||
By default, run the given *command* in an dockcross Docker container. | ||
|
||
The *options* can be one of: | ||
|
||
--args|-a Extra args to the *docker run* command | ||
--image|-i Docker cross-compiler image to use | ||
--config|-c Bash script to source before running this script | ||
|
||
|
||
Additionally, there are special update commands: | ||
|
||
update-image | ||
update-script | ||
update | ||
|
||
For update command help use: $0 help <command> | ||
ENDHELP | ||
exit 1 | ||
fi | ||
} | ||
|
||
#------------------------------------------------------------------------------ | ||
# Option processing | ||
# | ||
special_update_command='' | ||
while [[ $# != 0 ]]; do | ||
case $1 in | ||
|
||
--) | ||
break | ||
;; | ||
|
||
--args|-a) | ||
ARG_ARGS="$2" | ||
shift 2 | ||
;; | ||
|
||
--config|-c) | ||
ARG_CONFIG="$2" | ||
shift 2 | ||
;; | ||
|
||
--image|-i) | ||
ARG_IMAGE="$2" | ||
shift 2 | ||
;; | ||
update|update-image|update-script) | ||
special_update_command=$1 | ||
break | ||
;; | ||
-*) | ||
err Unknown option \"$1\" | ||
command:help | ||
exit | ||
;; | ||
|
||
*) | ||
break | ||
;; | ||
|
||
esac | ||
done | ||
|
||
# The precedence for options is: | ||
# 1. command-line arguments | ||
# 2. environment variables | ||
# 3. defaults | ||
|
||
# Source the config file if it exists | ||
DEFAULT_DOCKCROSS_CONFIG=~/.dockcross | ||
FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}} | ||
|
||
[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG" | ||
|
||
# Set the docker image | ||
FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}} | ||
|
||
# Handle special update command | ||
if [ "$special_update_command" != "" ]; then | ||
case $special_update_command in | ||
|
||
update) | ||
command:update | ||
exit $? | ||
;; | ||
|
||
update-image) | ||
command:update-image | ||
exit $? | ||
;; | ||
|
||
update-script) | ||
command:update-script | ||
exit $? | ||
;; | ||
|
||
esac | ||
fi | ||
|
||
# Set the docker run extra args (if any) | ||
FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}} | ||
|
||
# If we are not running via boot2docker | ||
if [ -z $DOCKER_HOST ]; then | ||
USER_IDS="-e BUILDER_UID=$( id -u ) -e BUILDER_GID=$( id -g ) -e BUILDER_USER=$( id -un ) -e BUILDER_GROUP=$( id -gn )" | ||
fi | ||
|
||
#------------------------------------------------------------------------------ | ||
# Now, finally, run the command in a container | ||
# | ||
docker run --rm \ | ||
-v $PWD:/work \ | ||
$USER_IDS \ | ||
$FINAL_ARGS \ | ||
$FINAL_IMAGE "$@" | ||
|
||
################################################################################ | ||
# | ||
# This image is not intended to be run manually. | ||
# | ||
# To create a dockcross helper script for the | ||
# dockcross/linux-armv7 image, run: | ||
# | ||
# docker run --rm dockcross/linux-armv7 > dockcross-linux-armv7 | ||
# chmod +x dockcross-linux-armv7 | ||
# | ||
# You may then wish to move the dockcross script to your PATH. | ||
# | ||
################################################################################ |
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 |
---|---|---|
|
@@ -162,6 +162,9 @@ else if (osName.contains("Linux")) { | |
else if (osName.contains("AIX")) { | ||
return "AIX"; | ||
} | ||
else if (osName.contains("Android")) { | ||
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. @psini Did you check the actual value of |
||
return "Android"; | ||
} | ||
|
||
else { | ||
return osName.replaceAll("\\W", ""); | ||
|
@@ -171,4 +174,4 @@ else if (osName.contains("AIX")) { | |
static String translateArchNameToFolderName(String archName) { | ||
return archName.replaceAll("\\W", ""); | ||
} | ||
} | ||
} |
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.
A concern here is OS_NAME (Android) should match JVM system property
os.name
of DalvikVM for Android.