X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/60f09ba592b713011783bc7b5d1c6fcfa9fad705..32ef012d3c5275f33ed388600ec9d1173dbe4311:/packages/aapt/build.sh

diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 707ca011..7bceacea 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -1,12 +1,15 @@
 TERMUX_PKG_HOMEPAGE=http://elinux.org/Android_aapt
 TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
-TERMUX_PKG_VERSION=7.0.0
+_TAG_VERSION=7.0.0
+_TAG_REVISION=6
+TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libexpat, libpng, libzopfli"
 TERMUX_PKG_CLANG=yes
 
 termux_step_make_install () {
-	local _TAGNAME=${TERMUX_PKG_VERSION}_r1
+	local _TAGNAME=${_TAG_VERSION}_r${_TAG_REVISION}
 
 	SYSTEM_CORE_INCLUDE_TARFILE=$TERMUX_PKG_CACHEDIR/system_core_include_${_TAGNAME}.tar.gz
 	test ! -f $SYSTEM_CORE_INCLUDE_TARFILE && termux_download \
@@ -37,7 +40,6 @@ termux_step_make_install () {
 	tar xf $ANDROID_BASE_INCLUDE_TARFILE
 
 
-
 	# Build libcutils:
 	mkdir -p $TERMUX_PKG_SRCDIR/{libcutils,androidfw}
 	cd $TERMUX_PKG_SRCDIR/libcutils
@@ -86,6 +88,7 @@ termux_step_make_install () {
 		$libcutils_nonwindows_sources \
 		trace-host.c \
 		properties.c \
+		-llog \
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-cutils.so
 
@@ -141,6 +144,7 @@ termux_step_make_install () {
 		$SAFE_IOP_DIR/src/safe_iop.cpp \
 		$commonSources \
 		-landroid-cutils \
+		-llog \
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-utils.so
 
@@ -171,6 +175,7 @@ termux_step_make_install () {
 		-D__USE_BSD \
 		-isystem $AOSP_INCLUDE_DIR \
 		$libbase_src_files $libbase_linux_src_files \
+		-llog \
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-base.so
 
@@ -193,6 +198,9 @@ termux_step_make_install () {
 		-isystem $AOSP_INCLUDE_DIR \
 		$libziparchive_source_files \
 		-landroid-base \
+		-landroid-utils \
+		-lz \
+		-llog \
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-ziparchive.so
 
@@ -226,7 +234,11 @@ termux_step_make_install () {
 		-DACONFIGURATION_SCREENROUND_NO=0x1 \
 		-DACONFIGURATION_SCREENROUND_YES=0x2 \
 		-DACONFIGURATION_SCREEN_ROUND=0x8000 \
-		-landroid-cutils -landroid-ziparchive \
+		-landroid-cutils \
+		-landroid-utils \
+		-landroid-ziparchive \
+		-llog \
+		-lz \
 		-shared \
 		-o $TERMUX_PREFIX/lib/libandroid-fw.so
 
@@ -278,7 +290,6 @@ termux_step_make_install () {
 		-o $TERMUX_PREFIX/bin/zipalign
 
 
-
 	# Remove this one for now:
 	rm -Rf $AOSP_INCLUDE_DIR
 }