X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d4132dd039c5bb6dd77d48f3e47fb1d79db29d0f..4266f6b764b0c3787ded35e026ee3205ae7ee6f9:/packages/aapt/build.sh

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 14d95025..4373c126 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -1,16 +1,17 @@
-# FIXME: We would like to enable checksums when downloading
-# tar files, but they change each time as the tar metadata
-# 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=1
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
 
 termux_step_make_install () {
+	# FIXME: We would like to enable checksums when downloading
+	# tar files, but they change each time as the tar metadata
+	# differs: https://github.com/google/gitiles/issues/84
+
 	local _TAGNAME=${_TAG_VERSION}_r${_TAG_REVISION}
 
 	SYSTEM_CORE_INCLUDE_TARFILE=$TERMUX_PKG_CACHEDIR/system_core_include_${_TAGNAME}.tar.gz
@@ -176,7 +177,9 @@ termux_step_make_install () {
 	libbase_linux_src_files="\
 		errors_unix.cpp"
 	# __USE_BSD for DEFFILEMODE to be defined by <sys/stat.h>.
-	$CXX $CXXFLAGS $CPPFLAGS -std=c++11 \
+	$CXX $CXXFLAGS $CPPFLAGS \
+		-std=c++11 \
+		-include memory \
 		-D__USE_BSD \
 		-isystem $AOSP_INCLUDE_DIR \
 		$libbase_src_files $libbase_linux_src_files \
@@ -197,7 +200,7 @@ termux_step_make_install () {
 		zip_archive.cc \
 		zip_archive_stream_entry.cc \
 		zip_writer.cc"
-	sed -i 's%next_in = reinterpret_cast<const uint8_t\*>(data)%next_in = const_cast<uint8_t\*>(reinterpret_cast<const uint8_t\*>(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 \
@@ -232,11 +235,9 @@ termux_step_make_install () {
 		ZipFileRO.cpp \
 		ZipUtils.cpp"
 	sed -i 's%#include <binder/TextOutput.h>%%' ResourceTypes.cpp
-	if [ -z "${TERMUX_UNIFIED_HEADERS:=""}" ]; then
-		CPPFLAGS+=" -DACONFIGURATION_SCREENROUND_ANY=0x00 -DACONFIGURATION_SCREENROUND_NO=0x1 -DACONFIGURATION_SCREENROUND_YES=0x2 -DACONFIGURATION_SCREEN_ROUND=0x8000"
-	fi
 	$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
 		-std=c++11 \
+		-include memory \
 		$commonSources \
 		-landroid-cutils \
 		-landroid-utils \
@@ -257,6 +258,7 @@ termux_step_make_install () {
 	sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PKG_BUILDER_DIR/aapt-Main.cpp.patch.txt | patch -p1
 	$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS \
 		-std=c++11 \
+		-include memory \
 		-DANDROID_SMP=1 \
 		-DNDEBUG=1 \
 		-DHAVE_ENDIAN_H=1 -DHAVE_POSIX_FILEMAP=1 -DHAVE_OFF64_T=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_PTHREADS=1 \
@@ -297,8 +299,8 @@ 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-27/android.jar .
 	unzip -q android.jar
 	mkdir -p $TERMUX_PREFIX/share/aapt
-	zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
+	jar cfM $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc
 }