From 1a33dcb11b7b210c90a6d047b2b2c1a161ffada1 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 21 Feb 2019 12:44:30 +0100 Subject: [PATCH] build: add android-configure scripts to EXTRA_DIST MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit baa81465a ("build: add compile for android arm64/x86/x86-64") introduced a number of new android-configure scripts but didn't add them to EXTRA_DIST in Makefile.am, causing `make dist` to fail. This commit also removes checkspare.sh from EXTRA_DIST. I broke that in commit a7a16219d ("unix: remove checksparse.sh") from last June. Mea culpa! Fixes: https://github.com/libuv/libuv/issues/2190 PR-URL: https://github.com/libuv/libuv/pull/2198 Reviewed-By: Saúl Ibarra Corretgé Reviewed-By: Colin Ihrig --- Makefile.am | 6 ++++-- README.md | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index a4068b2d..5569413b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,11 +121,13 @@ EXTRA_DIST = test/fixtures/empty_file \ docs \ img \ samples \ - android-configure \ + android-configure-arm \ + android-configure-arm64 \ + android-configure-x86 \ + android-configure-x86_64 \ CONTRIBUTING.md \ LICENSE \ README.md \ - checksparse.sh \ vcbuild.bat \ common.gypi \ gyp_uv.py \ diff --git a/README.md b/README.md index fb5971d3..4e92a817 100644 --- a/README.md +++ b/README.md @@ -312,7 +312,7 @@ $ make -C out The default API level is 24, but a different one can be selected as follows: ```bash -$ source ./android-configure ~/android-ndk-r15b gyp 21 +$ source ./android-configure-arm ~/android-ndk-r15b gyp 21 $ make -C out ```