Upgrade to platform-tools-34.0.5

CMakeLists.txt

@@ -24,8 +24,8 @@ set(ANDROID_MKE2FS_NAME "mke2fs.android")
 
 # Version of android-tools and the version of boringssl being used.
 # See: https://android.googlesource.com/platform/external/boringssl/+/platform-tools-${ANDROID_VERSION}/BORINGSSL_REVISION
-set(ANDROID_VERSION 34.0.4)
-set(BORINGSSL_VERSION 32b51305debe43e38e7bf2c2b13c4ebf3b474e80)
+set(ANDROID_VERSION 34.0.5)
+set(BORINGSSL_VERSION e28988ecaa5e72523a982915084c9422e495116d)
 
 # Vendor string used in version outputs.
 set(ANDROID_VENDOR android-tools)

patches/adb/0003-adb-include-missing-headers.patch

@@ -0,0 +1,24 @@
+From c37bd188a394b36ecb5aa5eeac9469fc5ef4473a Mon Sep 17 00:00:00 2001
+From: Biswapriyo Nath <nathbappai@gmail.com>
+Date: Thu, 1 Feb 2024 19:39:48 +0530
+Subject: [PATCH] adb include missing headers
+
+---
+ sysdeps/uio.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sysdeps/uio.h b/sysdeps/uio.h
+index f3ace64..266a20b 100644
+--- a/sysdeps/uio.h
++++ b/sysdeps/uio.h
+@@ -34,6 +34,7 @@ ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt);
+
+ #else
+
++#include <limits.h>
+ #include <sys/uio.h>
+ using adb_iovec = struct iovec;
+ inline ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt) {
+-- 
+2.43.0
+

patches/adb/0026-Drop-compile-static-check.patch

@@ -0,0 +1,28 @@
+From 4c9629c66710d7ed4ec684f231406dd54c91ef98 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Tue, 19 Mar 2024 16:46:39 -0700
+Subject: [PATCH] Drop compile static check
+
+This static check does not work well with libstdc++. It is not entirely
+clear if this check error is valid or just clang being too strict.
+
+See https://github.com/nmeum/android-tools/pull/132#issuecomment-1949786658
+---
+ types.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/types.h b/types.h
+index 2865969f..6335d16f 100644
+--- a/types.h
++++ b/types.h
+@@ -232,7 +232,6 @@ struct IOVector {
+
+         size_t offset = 0;
+         iterate_blocks([&offset, &result](const char* data, size_t len) {
+-            static_assert(std::is_standard_layout<decltype(result)>());
+             memcpy(&result[offset], data, len);
+             offset += len;
+         });
+-- 
+2.44.0
+

patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch

@@ -11,18 +11,18 @@ to new warnings introduced by GCC upstream.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1fb153..b9a3475 100644
+index 1529526b..a393b7d7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
- if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+@@ -140,7 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
    # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
    # primarily on our normal Clang one.
--  set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
-+  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
+   # TODO(bbe) took out -Wmissing-field-initializers for pki - fix and put back or disable only for pki
+-  set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
++  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
    if(MSVC)
      # clang-cl sets different default warnings than clang. It also treats -Wall
      # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
--- 
+--
 2.40.1