diff options
| author | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-06-04 16:24:49 -0500 |
| commit | a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7 (patch) | |
| tree | 0c52bbae1c242fbc296bd650fcd1167685f81492 /dev-util/android-tools | |
| parent | bfd9c39e4712ebdb442d4ca0673061faed1e70e1 (diff) | |
| download | baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.gz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.tar.xz baldeagleos-repo-a3ceca1b4c0d9bdb550dc23f06ffbb5a8e033bc7.zip | |
Adding metadata
Diffstat (limited to 'dev-util/android-tools')
| -rw-r--r-- | dev-util/android-tools/Manifest | 2 | ||||
| -rw-r--r-- | dev-util/android-tools/android-tools-35.0.2.ebuild | 114 | ||||
| -rw-r--r-- | dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch | 27 | ||||
| -rw-r--r-- | dev-util/android-tools/files/android-tools-35.0.2-protobuf.patch | 36 | ||||
| -rw-r--r-- | dev-util/android-tools/metadata.xml | 15 |
5 files changed, 0 insertions, 194 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest deleted file mode 100644 index 2d663b10326f..000000000000 --- a/dev-util/android-tools/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423 -DIST android-tools-35.0.2.tar.xz 18847376 BLAKE2B 5db4d32e4d9acca5f98f0fa76d02f2cbb9c8ad23f7138deb57aa78bcfb02e8e1998dd5649e2a7f77df99f4f4c0b47440c8f6b84d2a001ae8ec2f4840e01535a8 SHA512 391ce4d638b274d7bbae24a3df8de8b5812a982570f29b2aef37d12a3ba7ed6f66b5c0b7f908759e0b0da30d152b5319af0fef16c54bdc3b9f4074fb22f80d10 diff --git a/dev-util/android-tools/android-tools-35.0.2.ebuild b/dev-util/android-tools/android-tools-35.0.2.ebuild deleted file mode 100644 index ae3e30faf5f9..000000000000 --- a/dev-util/android-tools/android-tools-35.0.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{13..14} ) - -inherit cmake flag-o-matic python-r1 - -DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" -HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/" - -MY_PV="${PV//_/}" -SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz - https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch -" -S="${WORKDIR}/${PN}-${MY_PV}" - -# The entire source code is Apache-2.0, except for fastboot which is BSD-2. -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="python udev" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# dev-libs/libpcre only required for e2fsdroid -DEPEND=" - app-arch/brotli:= - app-arch/lz4:= - app-arch/zstd:= - dev-cpp/abseil-cpp:= - dev-libs/libpcre2:= - dev-libs/protobuf:= - virtual/zlib:= - >=dev-libs/libusb-1.0.28 - >=dev-libs/libfmt-11:= -" -RDEPEND="${DEPEND} - udev? ( dev-util/android-udev-rules ) - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/go - dev-lang/perl - dev-libs/protobuf[protoc(+)] -" - -DOCS=() - -src_prepare() { - eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" - eapply "${FILESDIR}/android-tools-35.0.2-protobuf.patch" - eapply "${FILESDIR}/android-tools-35.0.2-gcc-16.patch" - - cd "${S}/vendor/core" || die - eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" - - cd "${S}/vendor/libziparchive" || die - eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" - - cd "${S}" || die - - rm -r patches || die - cmake_src_prepare -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # - # https://bugs.gentoo.org/858311 - # https://issuetracker.google.com/issues/347247969 - # - # and in vendored f2fs-tools copy: - # https://bugs.gentoo.org/863896 - filter-lto - - local mycmakeargs=( - # Statically link the bundled boringssl - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ - -Dprotobuf_MODULE_COMPATIBLE=ON - -DBUILD_SHARED_LIBS=OFF - ) - cmake_src_configure -} - -src_compile() { - export GOCACHE="${T}/go-build" - export GOFLAGS="-mod=vendor" - cmake_src_compile -} - -src_install() { - cmake_src_install - rm "${ED}/usr/bin/mkbootimg" || die - rm "${ED}/usr/bin/unpack_bootimg" || die - rm "${ED}/usr/bin/repack_bootimg" || die - rm "${ED}/usr/bin/mkdtboimg" || die - rm "${ED}/usr/bin/avbtool" || die - - if use python; then - python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg - python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg - python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg - python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg - python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool - fi - docinto adb - doman vendor/adb/docs/user/adb.1 - docinto fastboot - dodoc vendor/core/fastboot/README.md -} diff --git a/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch b/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch deleted file mode 100644 index 915a972e0e6c..000000000000 --- a/dev-util/android-tools/files/android-tools-35.0.2-gcc-16.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://android-review.googlesource.com/c/platform/system/libbase/+/3555906 -https://android-review.googlesource.com/c/platform/system/libziparchive/+/3649395 - -diff --git a/vendor/libbase/hex.cpp b/vendor/libbase/hex.cpp -index a4b7715..85ba671 100644 ---- a/vendor/libbase/hex.cpp -+++ b/vendor/libbase/hex.cpp -@@ -18,6 +18,8 @@ - - #include "android-base/logging.h" - -+#include <stdint.h> -+ - namespace android { - namespace base { - -diff --git a/vendor/libziparchive/include/ziparchive/zip_writer.h b/vendor/libziparchive/include/ziparchive/zip_writer.h -index 268e8b6..aca7f4e 100644 ---- a/vendor/libziparchive/include/ziparchive/zip_writer.h -+++ b/vendor/libziparchive/include/ziparchive/zip_writer.h -@@ -16,6 +16,7 @@ - - #pragma once - -+#include <cstdint> - #include <cstdio> - #include <ctime> diff --git a/dev-util/android-tools/files/android-tools-35.0.2-protobuf.patch b/dev-util/android-tools/files/android-tools-35.0.2-protobuf.patch deleted file mode 100644 index b5b02a27bcca..000000000000 --- a/dev-util/android-tools/files/android-tools-35.0.2-protobuf.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 36c605004ae1c75813181ffe4c59907016aaf9e9 Mon Sep 17 00:00:00 2001 -From: Biswapriyo Nath <nathbappai@gmail.com> -Date: Tue, 22 Apr 2025 15:12:23 +0000 -Subject: [PATCH] extras/libjsonpb: Fix incompatibility with protobuf v30 - -This commit fixes the following compiler error. - -jsonpb.cpp:36:44: error: invalid operands to binary expression ( -'basic_string<char, char_traits<char>, allocator<char>>' and -'internal::DescriptorStringView' (aka 'basic_string_view<char>')) -36 | return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name(); - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -More info here https://protobuf.dev/news/2024-10-02/#descriptor-apis - -Change-Id: I3c76d51dfdfbe013eaa5031e6194bf5edae1be35 ---- - libjsonpb/parse/jsonpb.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libjsonpb/parse/jsonpb.cpp b/libjsonpb/parse/jsonpb.cpp -index b342c2b..ebd71bf 100644 ---- a/vendor/extras/libjsonpb/parse/jsonpb.cpp -+++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp -@@ -33,7 +33,7 @@ using google::protobuf::util::TypeResolver; - static constexpr char kTypeUrlPrefix[] = "type.googleapis.com"; - - std::string GetTypeUrl(const Message& message) { -- return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name(); -+ return std::string(kTypeUrlPrefix) + "/" + std::string(message.GetDescriptor()->full_name()); - } - - ErrorOr<std::string> MessageToJsonString(const Message& message) { --- -2.49.0 - diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml deleted file mode 100644 index e9527752ee29..000000000000 --- a/dev-util/android-tools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <bugs-to>https://source.android.com/setup/contribute/report-bugs</bugs-to> - <changelog>https://android.googlesource.com/platform/packages/modules/adb/+log</changelog> - <doc>https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT</doc> - <remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id> - <remote-id type="github">nmeum/android-tools</remote-id> - </upstream> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> -</pkgmetadata> |
