Skip to content

Commit

Permalink
Upgrade to platform-tools-34.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Biswa96 committed Feb 6, 2024
1 parent 399d5f3 commit 698b1f2
Show file tree
Hide file tree
Showing 30 changed files with 217 additions and 290 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 24 additions & 0 deletions patches/adb/0003-adb-include-missing-headers.patch
Original file line number Diff line number Diff line change
@@ -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

24 changes: 0 additions & 24 deletions patches/adb/0024-Add-explicit-constructor-for-fdevent_event.patch

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading

0 comments on commit 698b1f2

Please sign in to comment.