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.

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

DO-NOT-MERGE: debug android CI #1225

Closed
wants to merge 8 commits into from

Commits on Apr 28, 2018

  1. android: fix sdkmanager license issues

    In android-build-wrapper.sh:
    - Always create the folder 'licenses'
    - Export 'SDKMANAGER_OPTS'
    
    Fixes a recent failure of the Android CI build
    where 'licenses/android-sdk-license' was no found
    after the 'yes | ...' call.
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    588457f View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2018

  1. android: fix "undefined reference to 'stdout'

    Attempt to fix "undefined reference to 'stdout'" by
    adding a __ANDROID_API__ definition equal to the Android
    API version for the toolchain.
    
    ref:
    android/ndk#272 (comment)
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    829de10 View commit details
    Browse the repository at this point in the history
  2. android: update NDK to 16b

    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    10fd312 View commit details
    Browse the repository at this point in the history
  3. android: build libzip using cmake

    Configure doesn't seem to catch the case of missing fts_*()
    and HAVE_FTS_H is not defined to libzip. Attempt to use
    cmake as a build system instead.
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    aa4c809 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. android: use clang instead of gcc

    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    aba40db View commit details
    Browse the repository at this point in the history
  2. android: hack HAVE_FTS_H in libzip's zipcmp.c

    The build fails with missing fts_*() functions in the NDK toolchains.
    CMake cannot find ZLIB while configure decides that HAVE_FTS_H should
    be set. Hack: use configure but replace the HAVE_FTS_H macro with
    HAVE_FTS_H__ to void fts_*() calls.
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    0ac2a30 View commit details
    Browse the repository at this point in the history
  3. android: find makedepend

    For some reason the Android CI build started failing with:
        makedepend: not found
    when building OpenSSL.
    
    Try to 'apt-get install' it in before_install.sh
    via xutils-dev.
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    d031bb9 View commit details
    Browse the repository at this point in the history
  4. android: hack the OpenSSL Makefile for Clang

    OpenSSL fails to build after 'make depend'.
    
    1) The -mandroid flag is not supported on Clang.
    Remove it from the Makefile.
    2) Some .S files throw:
        error: invalid instruction
    Remove the *_ASM defines from the Makefile.
    3) add no-asm to the 'config' line in 'env'
    
    Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
    neolit123 committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    db2ca2c View commit details
    Browse the repository at this point in the history