Skip to content
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

Use armv7 for android build on travis. #488

Closed
wants to merge 1 commit into from
Closed

Use armv7 for android build on travis. #488

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
24 changes: 12 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ matrix:
os: osx
osx_image: xcode8.2

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -50,7 +50,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -63,7 +63,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
dist: trusty
Expand All @@ -76,7 +76,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: linux
dist: trusty
Expand Down Expand Up @@ -585,7 +585,7 @@ matrix:
os: osx
osx_image: xcode8.2

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -598,7 +598,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -611,7 +611,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
dist: trusty
Expand All @@ -624,7 +624,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: linux
dist: trusty
Expand Down Expand Up @@ -1153,7 +1153,7 @@ matrix:
os: osx
osx_image: xcode8.2

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1166,7 +1166,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=DEBUG KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1179,7 +1179,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
dist: trusty
Expand All @@ -1192,7 +1192,7 @@ matrix:
sources:
- ubuntu-toolchain-r-test

- env: TARGET_X=arm-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: linux
dist: trusty
Expand Down
4 changes: 2 additions & 2 deletions mk/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ aarch64-unknown-linux-gnu)
arm-unknown-linux-gnueabihf)
export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf
;;
arm-linux-androideabi)
armv7-linux-androideabi)
# install the android sdk/ndk
mk/travis-install-android.sh

Expand Down Expand Up @@ -86,7 +86,7 @@ else
fi

case $TARGET_X in
arm-linux-androideabi)
armv7-linux-androideabi)
cargo test -vv -j2 --no-run ${mode-} ${FEATURES_X-} --target=$TARGET_X
emulator @arm-18 -no-skin -no-boot-anim -no-window &
adb wait-for-device
Expand Down
10 changes: 5 additions & 5 deletions mk/update-travis-yml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

compilers = {
"aarch64-unknown-linux-gnu" : [ "aarch64-linux-gnu-gcc" ],
"arm-linux-androideabi" : [ "arm-linux-androideabi-gcc" ],
"armv7-linux-androideabi" : [ "arm-linux-androideabi-gcc" ],
"arm-unknown-linux-gnueabihf" : [ "arm-linux-gnueabihf-gcc" ],
"i686-unknown-linux-gnu" : linux_compilers,
"x86_64-unknown-linux-gnu" : linux_compilers,
Expand Down Expand Up @@ -82,7 +82,7 @@
"x86_64-apple-darwin",
],
"linux" : [
"arm-linux-androideabi",
"armv7-linux-androideabi",
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
"i686-unknown-linux-gnu",
Expand Down Expand Up @@ -162,7 +162,7 @@ def prefix_all(prefix, xs):
sources = sorted(list(set(sources_with_dups)))

# TODO: Use trusty for everything?
if arch in ["aarch64", "arm"] and sys != "androideabi":
if arch in ["aarch64", "arm", "armv7"]:
template += """
dist: trusty
sudo: required"""
Expand Down Expand Up @@ -219,7 +219,7 @@ def get_linux_packages_to_install(target, compiler, arch, kcov):
packages += ["gcc-arm-linux-gnueabihf",
"g++-arm-linux-gnueabihf",
"libc6-dev-armhf-cross"]
if target == "arm-linux-androideabi":
if target == "armv7-linux-androideabi":
packages += ["expect",
"openjdk-6-jre-headless"]

Expand Down Expand Up @@ -248,7 +248,7 @@ def get_linux_packages_to_install(target, compiler, arch, kcov):
"libelf-dev",
"libdw-dev",
"binutils-dev"]
elif arch not in ["aarch64", "arm"]:
elif arch not in ["aarch64", "arm", "armv7"]:
raise ValueError("unexpected arch: %s" % arch)

return packages
Expand Down