aapt: Bump to 13.0.0.6

packages/aapt/aapt2-util-Util.cpp.patch

@@ -1,19 +1,26 @@
 --- a/base/tools/aapt2/util/Util.cpp
 +++ b/base/tools/aapt2/util/Util.cpp
-@@ -23,7 +23,6 @@
- 
+@@ -24,7 +24,6 @@
  #include "android-base/stringprintf.h"
+ #include "android-base/strings.h"
  #include "androidfw/StringPiece.h"
 -#include "build/version.h"
- 
  #include "text/Unicode.h"
  #include "text/Utf8Iterator.h"
-@@ -231,10 +230,7 @@
+ #include "util/BigBuffer.h"
+@@ -230,17 +229,7 @@
    // Update minor version whenever a feature or flag is added.
    static const char* const sMinorVersion = "19";
  
 -  // The build id of aapt2 binary.
--  static const std::string sBuildId = android::build::GetBuildNumber();
+-  static std::string sBuildId = android::build::GetBuildNumber();
+-
+-  if (android::base::StartsWith(sBuildId, "eng.")) {
+-    time_t now = time(0);
+-    tm* ltm = localtime(&now);
+-
+-    sBuildId = android::base::StringPrintf("eng.%d%d", 1900 + ltm->tm_year, 1 + ltm->tm_mon);
+-  }
 -
 -  return android::base::StringPrintf("%s.%s-%s", sMajorVersion, sMinorVersion, sBuildId.c_str());
 +  return android::base::StringPrintf("%s.%s", sMajorVersion, sMinorVersion);

packages/aapt/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://elinux.org/Android_aapt
 TERMUX_PKG_DESCRIPTION="Android Asset Packaging Tool"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-_TAG_VERSION=12.0.0
-_TAG_REVISION=27
+_TAG_VERSION=13.0.0
+_TAG_REVISION=6
 TERMUX_PKG_VERSION=${_TAG_VERSION}.${_TAG_REVISION}
-TERMUX_PKG_REVISION=5
 TERMUX_PKG_SRCURL=(https://android.googlesource.com/platform/frameworks/base
                    https://android.googlesource.com/platform/system/core
                    https://android.googlesource.com/platform/system/libbase
@@ -228,7 +227,7 @@ termux_step_make_install() {
 	rm -rf android-jar
 	mkdir android-jar
 	cd android-jar
-	cp $ANDROID_HOME/platforms/android-32/android.jar .
+	cp $ANDROID_HOME/platforms/android-33/android.jar .
 	unzip -q android.jar
 	mkdir -p $TERMUX_PREFIX/share/aapt
 	jar cfM $TERMUX_PREFIX/share/aapt/android.jar AndroidManifest.xml resources.arsc

packages/aapt/sources.sh

@@ -19,6 +19,7 @@ local libcutils_nonwindows_sources="
 "
 libcutils_nonwindows_sources+="
 	ashmem-host.cpp
+	canned_fs_config.cpp
 	fs_config.cpp
 	trace-host.cpp
 "
@@ -26,7 +27,6 @@ local libcutils_sources="
 	$libcutils_sockets_sources
 	$libcutils_nonwindows_sources
 	config_utils.cpp
-	canned_fs_config.cpp
 	iosched_policy.cpp
 	load_file.cpp
 	native_handle.cpp
@@ -69,10 +69,12 @@ local libbase_sources="
 	chrono_utils.cpp
 	cmsg.cpp
 	file.cpp
+	hex.cpp
 	logging.cpp
 	mapped_file.cpp
 	parsebool.cpp
 	parsenetaddress.cpp
+	posix_strerror_r.cpp
 	process.cpp
 	properties.cpp
 	stringprintf.cpp
@@ -231,8 +233,8 @@ local libaidl_sources="
 	aidl_to_rust.cpp
 	aidl_typenames.cpp
 	aidl.cpp
-	ast_cpp.cpp
 	ast_java.cpp
+	check_valid.cpp
 	code_writer.cpp
 	comments.cpp
 	diagnostics.cpp
@@ -244,11 +246,12 @@ local libaidl_sources="
 	generate_rust.cpp
 	import_resolver.cpp
 	io_delegate.cpp
-	line_reader.cpp
 	location.cpp
 	logging.cpp
 	options.cpp
 	parser.cpp
+	permission.cpp
+	preprocess.cpp
 "
 libaidl_sources+="
 	lex.yy.c

scripts/setup-android-sdk.sh

@@ -75,7 +75,7 @@ yes | $SDK_MANAGER --sdk_root="$ANDROID_HOME" --licenses
 yes | $SDK_MANAGER --sdk_root="$ANDROID_HOME" \
 		"platform-tools" \
 		"build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" \
-		"platforms;android-32" \
+		"platforms;android-33" \
 		"platforms;android-28" \
 		"platforms;android-24" \
 		"platforms;android-21"