update to android-16.0.0_r2

Author: Biswa96

CMakeLists.txt

@@ -44,7 +44,7 @@ find_package(Threads REQUIRED)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(libpng REQUIRED IMPORTED_TARGET libpng)
 
-set(ANDROID_VERSION "android-15.0.0_r23")
+set(ANDROID_VERSION "android-16.0.0_r2")
 configure_file(version.h.in build/version.h @ONLY)
 if(ANDROID_BUILD_TOOLS_MUSL_LIBC)
     configure_file(cdefs.h.in sys/cdefs.h @ONLY)

clone.sh

@@ -2,7 +2,7 @@
 
 set -x
 
-GIT_BRANCH="${1:-"android-15.0.0_r23"}"
+GIT_BRANCH="${1:-"android-16.0.0_r2"}"
 
 cd vendor
 

patches/base/0002-base-Include-missing-standard-headers.patch

@@ -8,9 +8,8 @@ Subject: [PATCH] base: Include missing standard headers
  libs/androidfw/BigBufferStream.cpp | 3 +++
  libs/androidfw/PngCrunch.cpp       | 3 +++
  tools/aapt2/AppInfo.h              | 2 ++
- tools/aapt2/cmd/Command.h          | 1 +
  tools/aapt2/io/StringStream.cpp    | 4 ++++
- 6 files changed, 14 insertions(+)
+ 5 files changed, 13 insertions(+)
 
 diff --git a/libs/androidfw/ApkParsing.cpp b/libs/androidfw/ApkParsing.cpp
 index 7eedfdb5c..d6bf0cf0d 100644
@@ -66,18 +65,6 @@ index cabbe7ea7..15461a3fa 100644
  namespace aapt {
 
  // Information relevant to building an app, parsed from the app's AndroidManifest.xml.
-diff --git a/tools/aapt2/cmd/Command.h b/tools/aapt2/cmd/Command.h
-index 1416e980e..8c3ec9d1f 100644
---- a/tools/aapt2/cmd/Command.h
-+++ b/tools/aapt2/cmd/Command.h
-@@ -18,6 +18,7 @@
- #define AAPT_COMMAND_H
- 
- #include <functional>
-+#include <memory>
- #include <optional>
- #include <ostream>
- #include <string>
 diff --git a/tools/aapt2/io/StringStream.cpp b/tools/aapt2/io/StringStream.cpp
 index bb3911b20..7ca9b4fb0 100644
 --- a/tools/aapt2/io/StringStream.cpp

patches/base/0003-base-Fix-variable-initialization.patch

@@ -27,6 +27,7 @@ set(libaapt2_SRCS
     base/tools/aapt2/io/ZipArchive.cpp
     base/tools/aapt2/link/AutoVersioner.cpp
     base/tools/aapt2/link/FeatureFlagsFilter.cpp
+    base/tools/aapt2/link/FlaggedXmlVersioner.cpp
     base/tools/aapt2/link/FlagDisabledResourceRemover.cpp
     base/tools/aapt2/link/ManifestFixer.cpp
     base/tools/aapt2/link/NoDefaultResourceRemover.cpp

patches/native/0001-native-Include-missing-standard-headers.patch

@@ -59,6 +59,10 @@ add_executable(aidl
     ${FLEX_AidlScanner_OUTPUTS}
 )
 
+target_include_directories(aidl PRIVATE
+    aidl/include
+)
+
 target_link_libraries(aidl PRIVATE
     libbase
     GTest::gtest