Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to platform-tools-34.0.1 #111

Merged
merged 2 commits into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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.0)
set(ANDROID_VERSION 34.0.1)
set(BORINGSSL_VERSION 1530333b25589ee4d4d52b10e78ee55dd82f6dcd)

# Vendor string used in version outputs.
Expand Down
19 changes: 16 additions & 3 deletions patches/core/0011-core-include-missing-headers.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
From 31d49215b221e6f7677c1983dc97a05640db3691 Mon Sep 17 00:00:00 2001
From eedb7ce70d3fdbe0feaa9dd2aa657ab71f88454f Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <[email protected]>
Date: Sat, 25 Feb 2023 15:13:29 +0530
Subject: [PATCH] core include missing headers

---
fastboot/fastboot.h | 1 +
fastboot/super_flash_helper.cpp | 2 ++
1 file changed, 2 insertions(+)
2 files changed, 3 insertions(+)

diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h
index b5fb8c0..bb238ed 100644
--- a/fastboot/fastboot.h
+++ b/fastboot/fastboot.h
@@ -27,6 +27,7 @@
*/
#pragma once

+#include <functional>
#include <string>

#include <bootimg.h>
diff --git a/fastboot/super_flash_helper.cpp b/fastboot/super_flash_helper.cpp
index b617ce8..647b26f 100644
--- a/fastboot/super_flash_helper.cpp
Expand All @@ -21,5 +34,5 @@ index b617ce8..647b26f 100644
using android::base::unique_fd;
using android::fs_mgr::SuperImageExtent;
--
2.39.2
2.40.1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -814,9 +814,9 @@ index 2a66941cef..fac80c0185 100644
+extern "C" {
+#endif

/**
* This registers the service with the default service manager under this instance name. This does
@@ -267,4 +268,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31);
enum AServiceManager_AddServiceFlag : uint32_t {
/**
@@ -294,4 +295,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31);
*/
void AServiceManager_reRegister() __INTRODUCED_IN(31);

Expand Down
3 changes: 3 additions & 0 deletions vendor/CMakeLists.fastboot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,13 @@ set(fastboot_SOURCES
core/fastboot/bootimg_utils.cpp
core/fastboot/fastboot.cpp
core/fastboot/fastboot_driver.cpp
core/fastboot/filesystem.cpp
core/fastboot/fs.cpp
core/fastboot/main.cpp
core/fastboot/socket.cpp
core/fastboot/storage.cpp
core/fastboot/super_flash_helper.cpp
core/fastboot/task.cpp
core/fastboot/tcp.cpp
core/fastboot/udp.cpp
core/fastboot/vendor_boot_img_utils.cpp
Expand Down
2 changes: 1 addition & 1 deletion vendor/adb
Submodule adb updated from 33e2d1 to e8ac5a
2 changes: 1 addition & 1 deletion vendor/avb
Submodule avb updated from c37a2c to 6f7b91
2 changes: 1 addition & 1 deletion vendor/base
Submodule base updated from 38a694 to d38353
2 changes: 1 addition & 1 deletion vendor/core
Submodule core updated from ddd2d0 to 9b298d
2 changes: 1 addition & 1 deletion vendor/e2fsprogs
Submodule e2fsprogs updated from e30077 to 3ca901
2 changes: 1 addition & 1 deletion vendor/extras
Submodule extras updated from cad289 to 26a85a
2 changes: 1 addition & 1 deletion vendor/f2fs-tools
Submodule f2fs-tools updated from fbea23 to 57d4ab
2 changes: 1 addition & 1 deletion vendor/logging
Submodule logging updated from 152e47 to cfbd2f
2 changes: 1 addition & 1 deletion vendor/native
Submodule native updated from 7ff29c to 42a51c
2 changes: 1 addition & 1 deletion vendor/selinux
Submodule selinux updated from 873d90 to cadcc8