X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d946e67c5b86dd990ffa0e5654b2a514b787aeb9..125a21e62849d9e5bd28d0a8f3bb96ac9668295f:/packages/aapt/build.sh diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh index 95f55c58..e93040f6 100644 --- a/packages/aapt/build.sh +++ b/packages/aapt/build.sh @@ -3,10 +3,10 @@ # differs: https://github.com/google/gitiles/issues/84 TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool" -_TAG_VERSION=7.0.0 -_TAG_REVISION=14 +_TAG_VERSION=7.1.2 +_TAG_REVISION=33 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION} -TERMUX_PKG_REVISION=2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli" @@ -199,7 +199,7 @@ termux_step_make_install () { zip_archive.cc \ zip_archive_stream_entry.cc \ zip_writer.cc" - sed -i 's%next_in = reinterpret_cast(data)%next_in = const_cast(reinterpret_cast(data))%' zip_writer.cc + patch -p0 < $TERMUX_PKG_BUILDER_DIR/libziparchive.patch.txt $CXX $CXXFLAGS $LDFLAGS -std=c++11 \ -DZLIB_CONST \ -isystem $AOSP_INCLUDE_DIR \ @@ -298,7 +298,7 @@ termux_step_make_install () { rm -rf android-jar mkdir android-jar cd android-jar - cp $ANDROID_HOME/platforms/android-25/android.jar . + cp $ANDROID_HOME/platforms/android-26/android.jar . unzip -q android.jar mkdir -p $TERMUX_PREFIX/share/aapt zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc