aapt: Fix inappropriate use after `std::move()`

* Specify `-DNDEBUG`
This commit is contained in:
Tee KOBAYASHI 2022-02-12 17:16:53 +09:00 committed by xtkoba
parent 7c375fd144
commit 715ce90c53
2 changed files with 18 additions and 2 deletions

View File

@ -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 */

View File

@ -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