diff options
| author | Jack Lloyd <[email protected]> | 2019-07-04 06:19:59 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-07-04 06:30:05 -0400 |
| commit | 18406954f201fd9d098b0dd299b006b500a72da0 (patch) | |
| tree | c38ab0e2cd834c5f38367f00553a4a3cd735facd | |
| parent | 9541d8f4c053f55edfc6b97fbf6c8e14d434364c (diff) | |
Android 28 has getentropy, test this
| -rw-r--r-- | src/build-data/os/android.txt | 3 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/build-data/os/android.txt b/src/build-data/os/android.txt index a88b81ec2..0f9d73f85 100644 --- a/src/build-data/os/android.txt +++ b/src/build-data/os/android.txt @@ -15,6 +15,9 @@ dev_random # for all min API levels. Use --without-os-feature=getauxval to disable getauxval +# Added in API 28 +#getentropy + sockets threads filesystem diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 5eadc6b88..83f26941e 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -163,14 +163,16 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro cc_bin = os.path.join(toolchain_dir, 'armv7a-linux-androideabi%d-clang++' % (api_lvl)) flags += ['--cpu=armv7', '--ar-command=%s' % (os.path.join(toolchain_dir, 'arm-linux-androideabi-ar'))] - - if api_lvl < 18: - flags += ['--without-os-features=getauxval'] elif target == 'cross-android-arm64': cc_bin = os.path.join(toolchain_dir, 'aarch64-linux-android%d-clang++' % (api_lvl)) flags += ['--cpu=arm64', '--ar-command=%s' % (os.path.join(toolchain_dir, 'aarch64-linux-android-ar'))] + if api_lvl < 18: + flags += ['--without-os-features=getauxval'] + if api_lvl >= 28: + flags += ['--with-os-features=getentropy'] + elif target == 'cross-i386': flags += ['--cpu=x86_32'] |