From 38eea7154cb5930259f7a3ae59cdb123fb7d2862 Mon Sep 17 00:00:00 2001
From: Ivan Afonichev <ivanaf@yandex-team.ru>
Date: Thu, 4 Jan 2024 01:20:43 +0400
Subject: [PATCH] Boringssl dropped support for ppc64le

---
 Disable-e2fsdroid-for-ppc64le.patch | 39 -----------------------------
 android-tools.spec                  |  7 ++----
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 Disable-e2fsdroid-for-ppc64le.patch

diff --git a/Disable-e2fsdroid-for-ppc64le.patch b/Disable-e2fsdroid-for-ppc64le.patch
deleted file mode 100644
index 2407c2e..0000000
--- a/Disable-e2fsdroid-for-ppc64le.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/vendor/CMakeLists.mke2fs.txt b/vendor/CMakeLists.mke2fs.txt
-index 5c0708d..1ac9a8a 100644
---- a/vendor/CMakeLists.mke2fs.txt
-+++ b/vendor/CMakeLists.mke2fs.txt
-@@ -118,6 +118,7 @@ target_link_libraries("${ANDROID_MKE2FS_NAME}"
- target_include_directories("${ANDROID_MKE2FS_NAME}" PRIVATE
- 	e2fsprogs/lib)
- 
-+if( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" )
- add_executable(e2fsdroid
- 	e2fsprogs/contrib/android/e2fsdroid.c
- 	e2fsprogs/contrib/android/basefs_allocator.c
-@@ -140,6 +141,7 @@ target_link_libraries(e2fsdroid
- target_include_directories(e2fsdroid PRIVATE
- 	e2fsprogs/lib e2fsprogs/lib/ext2fs selinux/libselinux/include
- 	core/libcutils/include e2fsprogs/misc)
-+endif()
- 
- add_executable(ext2simg
- 	e2fsprogs/contrib/android/ext2simg.c)
-diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
-index 0ea7a01..a29da55 100644
---- a/vendor/CMakeLists.txt
-+++ b/vendor/CMakeLists.txt
-@@ -108,10 +108,13 @@ install(TARGETS
- 	lpmake
- 	lpunpack
- 	simg2img
--	e2fsdroid
- 	ext2simg
- 	DESTINATION bin)
- 
-+if( NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" )
-+install(TARGETS "${ANDROID_MKE2FS_NAME}" e2fsdroid DESTINATION bin)
-+endif()
-+
- # Install common completion files.
- install(FILES adb/adb.bash RENAME adb DESTINATION "${COMPLETION_COMMON_DIR}")
- install(FILES core/fastboot/fastboot.bash RENAME fastboot DESTINATION "${COMPLETION_COMMON_DIR}")
diff --git a/android-tools.spec b/android-tools.spec
index 5a57d32..68baee5 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -14,9 +14,6 @@ URL:           http://developer.android.com/guide/developing/tools/
 Source0:       https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
 Source1:       51-android.rules
 Source2:       adb.service
-# e2fsdroid doesn't build on ppc64le
-# See https://github.com/tytso/e2fsprogs/issues/127
-Patch0:        Disable-e2fsdroid-for-ppc64le.patch
 
 BuildRequires: brotli-devel
 BuildRequires: cmake
@@ -46,7 +43,8 @@ Provides:      mke2fs.android = %{epoch}:%{version}-%{release}
 Provides: bundled(boringssl)
 
 # Bundled boringssl doesn't support the big endian architectures rhbz 1431379
-ExcludeArch: ppc ppc64 s390x
+# And dropped ppc64le support: https://github.com/google/boringssl/commit/7d2338d000eb1468a5bbf78e91854236e18fb9e4
+ExcludeArch: ppc ppc64 s390x ppc64le
 
 %description
 
@@ -70,7 +68,6 @@ setup between the host and the target phone as adb.
 
 %prep
 %setup -q
-%patch0 -p1
 cp -p %{SOURCE1} 51-android.rules
 
 %build