update to android-16.0.0_r4

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-16.0.0_r2")
+set(ANDROID_VERSION "android-16.0.0_r4")
 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-16.0.0_r2"}"
+GIT_BRANCH="${1:-"android-16.0.0_r4"}"
 
 cd vendor
 

patches/aidl/0001-aidl-Fix-ambiguous-dump_location-function.patch

@@ -0,0 +1,42 @@
+From 2ec75f1d098e35b37fcda15962dd02bb2eb85c73 Mon Sep 17 00:00:00 2001
+From: Biswapriyo Nath <nathbappai@gmail.com>
+Date: Wed, 1 Jan 2025 00:00:00 +0000
+Subject: [PATCH] aidl: Fix ambiguous dump_location function
+
+Fixes:
+generate_aidl_mappings.cpp:48:48: error: call of overloaded 'dump_location(AidlMethod&)' is ambiguous
+generate_java.cpp:979:72: error: call of overloaded 'dump_location(const AidlAnnotation&)' is ambiguous
+---
+ generate_aidl_mappings.cpp | 2 +-
+ generate_java.cpp          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/generate_aidl_mappings.cpp b/generate_aidl_mappings.cpp
+index 8acd85cc1f51..d1e9c8a999e9 100644
+--- a/generate_aidl_mappings.cpp
++++ b/generate_aidl_mappings.cpp
+@@ -45,7 +45,7 @@ SignatureMap generate_mappings(const AidlDefinedType* defined_type) {
+       }
+       signature << "|";
+       signature << java::JavaSignatureOf(method->GetType());
+-      mappings[signature.str()] = dump_location(*method);
++      mappings[signature.str()] = android::aidl::mappings::dump_location(*method);
+     }
+   }
+   return mappings;
+diff --git a/generate_java.cpp b/generate_java.cpp
+index 4263c11531a3..0f6c580c6e09 100644
+--- a/generate_java.cpp
++++ b/generate_java.cpp
+@@ -976,7 +976,7 @@ std::string GenerateJavaUnsupportedAppUsageParameters(const AidlAnnotation& a) {
+     const std::string& param_value = name_and_param.second;
+     parameters_decl.push_back(param_name + " = " + param_value);
+   }
+-  parameters_decl.push_back("overrideSourcePosition=\"" + dump_location(a) + "\"");
++  parameters_decl.push_back("overrideSourcePosition=\"" + android::aidl::java::dump_location(a) + "\"");
+   return "(" + Join(parameters_decl, ", ") + ")";
+ }
+ 
+-- 
+2.54.0
+

patches/aidl/0001-aidl-Move-AidlConstantValue-class-definition.patch

@@ -52,8 +52,20 @@ index cf3c0eeff..93cf715f9 100644
  #include <unordered_map>
  #include <unordered_set>
 
+diff --git a/libs/androidfw/include/androidfw/FileStream.h b/libs/androidfw/include/androidfw/FileStream.h
+index 87c42d12f825..eaccde0d390e 100644
+--- a/libs/androidfw/include/androidfw/FileStream.h
++++ b/libs/androidfw/include/androidfw/FileStream.h
+@@ -18,6 +18,7 @@
+ 
+ #include <memory>
+ #include <string>
++#include <stdint.h>
+ #include <unistd.h>
+ 
+ #include "Streams.h"
 diff --git a/tools/aapt2/AppInfo.h b/tools/aapt2/AppInfo.h
-index cabbe7ea7..15461a3fa 100644
+index cabbe7ea7446..15461a3fa896 100644
 --- a/tools/aapt2/AppInfo.h
 +++ b/tools/aapt2/AppInfo.h
 @@ -21,6 +21,8 @@