From 715ce90c53eb9e44c12a5378df907a94522f7df2 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sat, 12 Feb 2022 17:16:53 +0900
Subject: [PATCH] aapt: Fix inappropriate use after `std::move()`

* Specify `-DNDEBUG`
---
 packages/aapt/androidfw-AssetManager.cpp.patch | 16 ++++++++++++++++
 packages/aapt/build.sh                         |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 packages/aapt/androidfw-AssetManager.cpp.patch

diff --git a/packages/aapt/androidfw-AssetManager.cpp.patch b/packages/aapt/androidfw-AssetManager.cpp.patch
new file mode 100644
index 000000000..2fce38d40
--- /dev/null
+++ b/packages/aapt/androidfw-AssetManager.cpp.patch
@@ -0,0 +1,16 @@
+--- a/base/libs/androidfw/AssetManager.cpp
++++ b/base/libs/androidfw/AssetManager.cpp
+@@ -940,13 +940,9 @@
+ 
+     if (method == ZipFileRO::kCompressStored) {
+         pAsset = Asset::createFromUncompressedMap(std::move(*dataMap), mode);
+-        ALOGV("Opened uncompressed entry %s in zip %s mode %d: %p", entryName.string(),
+-                dataMap->file_name(), mode, pAsset.get());
+     } else {
+         pAsset = Asset::createFromCompressedMap(std::move(*dataMap),
+             static_cast<size_t>(uncompressedLen), mode);
+-        ALOGV("Opened compressed entry %s in zip %s mode %d: %p", entryName.string(),
+-                dataMap->file_name(), mode, pAsset.get());
+     }
+     if (pAsset == NULL) {
+         /* unexpected */
diff --git a/packages/aapt/build.sh b/packages/aapt/build.sh
index 682e3bac3..020d9a995 100644
--- a/packages/aapt/build.sh
+++ b/packages/aapt/build.sh
@@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 _TAG_VERSION=12.0.0
 _TAG_REVISION=27
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/frameworks/base
                    https://android.googlesource.com/platform/system/core
                    https://android.googlesource.com/platform/system/libbase
@@ -86,7 +86,7 @@ termux_step_pre_configure() {
 
 	CFLAGS+=" -fPIC"
 	CXXFLAGS+=" -fPIC -std=c++17"
-	CPPFLAGS+=" -D__ANDROID_SDK_VERSION__=__ANDROID_API__"
+	CPPFLAGS+=" -DNDEBUG -D__ANDROID_SDK_VERSION__=__ANDROID_API__"
 
 	_TMP_LIBDIR=$TERMUX_PKG_SRCDIR/_lib
 	rm -rf $_TMP_LIBDIR