X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/544181cd4fe22c3696af5d5d7d97a920dbc279c6..df2360c4581760915c79d52dc2efede900c6d2ac:/packages/aapt/build.sh

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 3f5d6826..92bac76f 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -51,6 +51,7 @@ termux_step_make_install () {
 		"https://android.googlesource.com/platform/system/core/+archive/android-$_TAGNAME/libcutils.tar.gz" \
 		$LIBCUTILS_TARFILE
 	tar xf $LIBCUTILS_TARFILE
+	patch -p0 < $TERMUX_PKG_BUILDER_DIR/libcutils-patch.txt
 	$CXX $CXXFLAGS -isystem $AOSP_INCLUDE_DIR -c -o sockets.o sockets.cpp
 	$CXX $CXXFLAGS -isystem $AOSP_INCLUDE_DIR -c -o sockets_unix.o sockets_unix.cpp
 	sed -i 's%include <sys/_system_properties.h>%include <sys/system_properties.h>%' properties.c
@@ -231,13 +232,9 @@ termux_step_make_install () {
 		ZipFileRO.cpp \
 		ZipUtils.cpp"
 	sed -i 's%#include <binder/TextOutput.h>%%' ResourceTypes.cpp
-	$CXX $CXXFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
+	$CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -isystem $AOSP_INCLUDE_DIR \
 		-std=c++11 \
 		$commonSources \
-		-DACONFIGURATION_SCREENROUND_ANY=0x00 \
-		-DACONFIGURATION_SCREENROUND_NO=0x1 \
-		-DACONFIGURATION_SCREENROUND_YES=0x2 \
-		-DACONFIGURATION_SCREEN_ROUND=0x8000 \
 		-landroid-cutils \
 		-landroid-utils \
 		-landroid-ziparchive \
@@ -246,8 +243,6 @@ termux_step_make_install () {
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-fw.so
 
-
-
 	# Build aapt:
 	AAPT_TARFILE=$TERMUX_PKG_CACHEDIR/aapt_${_TAGNAME}.tar.gz
 	test ! -f $AAPT_TARFILE && termux_download \
@@ -262,10 +257,6 @@ termux_step_make_install () {
 		-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 \
-		-DACONFIGURATION_SCREENROUND_ANY=0x00 \
-		-DACONFIGURATION_SCREENROUND_NO=0x1 \
-		-DACONFIGURATION_SCREENROUND_YES=0x2 \
-		-DACONFIGURATION_SCREEN_ROUND=0x8000 \
 		-isystem $AOSP_INCLUDE_DIR \
 		*.cpp \
 		-landroid-cutils -landroid-utils -landroid-fw -landroid-ziparchive \
@@ -303,7 +294,7 @@ termux_step_make_install () {
 	rm -rf android-jar
 	mkdir android-jar
 	cd android-jar
-	cp $ANDROID_HOME/platforms/android-24/android.jar .
+	cp $ANDROID_HOME/platforms/android-25/android.jar .
 	unzip -q android.jar
 	mkdir -p $TERMUX_PREFIX/share/aapt
 	zip -q $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc