Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update for Android cross-compilation. #10180

Merged
merged 6 commits into from
Jan 15, 2019
Merged

Update for Android cross-compilation. #10180

merged 6 commits into from
Jan 15, 2019

Conversation

TriplEight
Copy link
Collaborator

Hey @tomaka , could you take a look at the changes in the script.

Unfortunately, there's nothing can be done with this monstrous Dockerfile: https://github.com/paritytech/scripts/blob/master/docker-files-for-Gitlab-CI-rust/cross/android/Dockerfile (size: 4111). I've also updated and pushed it to the docker hub.

@parity-cla-bot
Copy link

It looks like @TriplEight signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@TriplEight
Copy link
Collaborator Author

@niklasad1
Copy link
Collaborator

@TriplEight shouldn't we link with arm-linux-androideabi-clang according to the log /usr/bin/ld is used a linker in the for android cross-compilation?!

@TriplEight
Copy link
Collaborator Author

@niklasad1 thanks for the tip, the linker you've mentioned was used, but incorrectly added in the Dockerfile.

Copy link
Contributor

@gabreal gabreal left a comment

Choose a reason for hiding this comment

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

How come only the parity-clib target is needed for android?
And I guess the cargo config files will be included in the docker containers then?

add android postprocessing
if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
then
# only thing we need for android
cp -v ../../target/$CARGO_TARGET/release/parity ./parity-clib
Copy link
Contributor

Choose a reason for hiding this comment

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

That would be libparity.so, not parity.

@General-Beck General-Beck added A0-pleasereview 🤓 Pull request needs code review. M5-binaries 📦 External binaries (ethkey, ethstore, ethvm, etc.) M1-ci 🙉 Continuous integration. labels Jan 15, 2019
@5chdn 5chdn added this to the 2.4 milestone Jan 15, 2019
@5chdn 5chdn added B1-patch-beta 🕷🕷 B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. labels Jan 15, 2019
@TriplEight TriplEight merged commit ed6f287 into master Jan 15, 2019
@niklasad1 niklasad1 deleted the android_CI branch January 15, 2019 16:29
This was referenced Jan 21, 2019
5chdn pushed a commit that referenced this pull request Jan 22, 2019
* build-unix update

* .gitlab-ci update

* Update build-unix.sh

add android postprocessing

* path to android lib

libparity.so

* fix path to libparity

* add android lib to artifacts
5chdn pushed a commit that referenced this pull request Jan 22, 2019
* build-unix update

* .gitlab-ci update

* Update build-unix.sh

add android postprocessing

* path to android lib

libparity.so

* fix path to libparity

* add android lib to artifacts
5chdn added a commit that referenced this pull request Jan 22, 2019
* version: bump stable to 2.2.8

* Update for Android cross-compilation. (#10180)

* build-unix update

* .gitlab-ci update

* Update build-unix.sh

add android postprocessing

* path to android lib

libparity.so

* fix path to libparity

* add android lib to artifacts

* Cancel Constantinople HF on POA Core (#10198)

* Add EIP-1283 disable transition (#10214)

* Enable St-Peters-Fork ("Constantinople Fix") (#10223)

* ethcore: disable eip-1283 on kovan block 10255201

* ethcore: disable eip-1283 on ropsten block 4939394

* ethcore: enable st-peters-fork on mainnet block 7280000

* ethcore: fix kovan chain spec

* version: update fork blocks

* ethcore: disable eip-1283 on sokol block 7026400
5chdn added a commit that referenced this pull request Jan 22, 2019
* version: bump beta to 2.3.1

* Fix _cannot recursively call into `Core`_ issue (#10144)

* Change igd to github:maufl/rust-igd

* Run `igd::search_gateway_from_timeout` from own thread

* Update for Android cross-compilation. (#10180)

* build-unix update

* .gitlab-ci update

* Update build-unix.sh

add android postprocessing

* path to android lib

libparity.so

* fix path to libparity

* add android lib to artifacts

* Run all `igd` methods in its own thread (#10195)

* Cancel Constantinople HF on POA Core (#10198)

* Add EIP-1283 disable transition (#10214)

* Enable St-Peters-Fork ("Constantinople Fix") (#10223)

* ethcore: disable eip-1283 on kovan block 10255201

* ethcore: disable eip-1283 on ropsten block 4939394

* ethcore: enable st-peters-fork on mainnet block 7280000

* ethcore: fix kovan chain spec

* version: update fork blocks

* ethcore: disable eip-1283 on sokol block 7026400
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-pleasereview 🤓 Pull request needs code review. B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. M1-ci 🙉 Continuous integration. M5-binaries 📦 External binaries (ethkey, ethstore, ethvm, etc.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants