ndk_patches: Remove JNIHelp.h

[termux-packages] / packages / aapt / build.sh

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 931ff70..95f4d43 100644 (file)
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://android.googlesource.com/platform/system/core/+/android-4.4.4_r2/libutils
 TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
 TERMUX_PKG_VERSION=5.1.1
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libgnustl"
 
@@ -51,7 +52,7 @@ termux_step_make_install () {
 
         cd libcutils
         tar xf $LIBCUTILS_TARFILE
-        rm trace.c dlmalloc_stubs.c ashmem-host.c
+        rm trace.c dlmalloc_stubs.c ashmem-host.c dir_hash.c
 
         cd ../libutils
         tar xf $LIBUTILS_TARFILE
@@ -65,6 +66,8 @@ termux_step_make_install () {
        cd ../ziparchive
        tar xf $LIBZIPARCHIVE_TARFILE
        rm zip_archive_test.cc
+        # Remove include no longer needed:
+        perl -p -i -e 's|#include <JNIHelp.h>||' zip_archive.cc
 
         # png_set_expand_gray_1_2_4_to_8(png_ptr) is the newer name instead of png_set_gray_1_2_4_to_8(png_ptr):
         # libpng no longer defines "#define png_sizeof(x) (sizeof (x))"