From e79058d8797c918d37e406245ca7683cf07240d1 Mon Sep 17 00:00:00 2001 From: aguestuser Date: Sun, 23 Apr 2017 16:39:03 -0400 Subject: [ag] Fix native build step with revised dockerfile * PROBLEM: * most recent version (r14b) of `android-ndk` uses `clang` for cross-compilation * BUT: `openssl` cannot compile successfully w/ `clang` * AND: we depend on `openssl` transitively through `ics-openvpn` while trying to use `android-ndk` r14b * FIX: * downgrade to `android-ndk` (12b) (most recent versoin that still uses `gcc` instead of `clang`) * modify some of the default * REMAINING PROBLEMS: * some string translations for Jamaica now break the build (unclear why -- outdated country abbreviation? ja for jm???) * we are now using a version of ndk that is 2 versions old and a version of ics-openvpn (pinned to a 3.1.2016 commit via submodule) that depends on an outdated version of `openssl`, which raises security concerns. updating to the most recent version will force us to wade into all the dependency problems amongst `ics-openvpn`/`openssl`/`ndk` * REFERENCES: * on `openssl` incompatibility w/ clang: https://github.com/openssl/openssl/pull/2229 * on `ics-openvpn` problems with `ndk`: https://github.com/android-ndk/ndk/issues/144 --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ad57573..920f65d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,12 @@ +# NOTE(@aguestuser|4.23.17): +# - we would prefer 0xacab.org:4567/leap/bitmask_android:android-sdk +# as the build image, but cant do that presently b/c: +# (1) i do not have permissions to create docker repositories in this repo +# (2) we need to add whatever image we use to gitlab ci's whitelist +# or else we get a message like: +# `ERROR: The 0xacab.org:4567/aguestuser/bitmask_android:android-sdk-25 is not present on list of allowed images` + image: "0xacab.org:4567/leap/gitlab-buildpackage:android" -#image: "gfx2015/android" stages: - build -- cgit v1.2.3