Skip to content

Added x86_64 build target on android #50

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

Merged
ErikBjare merged 1 commit into from
May 24, 2019
Merged

Added x86_64 build target on android #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .cargo/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ linker = './NDK/arm/bin/arm-linux-androideabi-clang'
[target.i686-linux-android]
Copy link
Copy Markdown
Member

@johan-bjareholt johan-bjareholt May 24, 2019

Choose a reason for hiding this comment

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

Remove this as well

ar = './NDK/x86/bin/i686-linux-android-ar'
linker = './NDK/x86/bin/i686-linux-android-clang'

[target.x86_64-linux-android]
ar = './NDK/x86_64/bin/x86_64-linux-android-ar'
linker = './NDK/x86_64/bin/x86_64-linux-android-clang'
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ before_install:
${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch arm64 --install-dir "${ANDROID_NDK_HOME}/arm64";
${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir "${ANDROID_NDK_HOME}/arm";
${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch x86 --install-dir "${ANDROID_NDK_HOME}/x86";
rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android;
${ANDROID_NDK_HOME}/build/tools/make_standalone_toolchain.py --api 26 --arch x86_64 --install-dir "${ANDROID_NDK_HOME}/x86_64";
rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android;
fi

install:
Expand Down
10 changes: 8 additions & 2 deletions compile-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
exit 1
fi

# Ring won't build in the below target for whatever reason
# 'arm armv7-linux-androideabi' \
if [ $RELEASE ]; then
echo "Building in release mode... (slow)";
else
echo "Building in debug mode... (fast)"
fi

ORIG_PATH="$PATH"

# Ring won't build in the below target for whatever reason
# 'arm armv7-linux-androideabi' \
for archtargetstr in \
'x86 i686-linux-android' \
Copy link
Copy Markdown
Member

@johan-bjareholt johan-bjareholt May 24, 2019

Choose a reason for hiding this comment

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

Just remove 32-bit support completely, it just slows down testing time. I have a 10 year old laptop and even that has a 64-bit CPU. The Core 2 series were the first mainstream 64-bit Intel CPUs and they have been available for 13 years now!

Copy link
Copy Markdown
Member Author

@ErikBjare ErikBjare May 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I don't know why, but Google seems to suggest supporting 32-bit x86 is normal: https://developer.android.com/distribute/best-practices/develop/64-bit

Could check the device support matrix and see if there actually are any 32-bit x86 devices out there that don't support x86_64, but until then I'll keep it.

It's annoying with the build times, but I'd rather we make it such that we don't build for every target on non-release builds.

Copy link
Copy Markdown
Member

@johan-bjareholt johan-bjareholt May 24, 2019

Choose a reason for hiding this comment

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

Might be because of those mobile Intel mobile SoC for smartphones which Intel made one generation of and failed spectacularly in 2014, they were 32-bit. Since then they probably just want x86_64 APKs because of Chromebooks now supporting Android apps.

'x86_64 x86_64-linux-android' \
'arm64 aarch64-linux-android' \
; do
arch=$(echo $archtargetstr | cut -d " " -f 1)
Expand Down