diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-12 20:22:37 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-12 20:22:37 +0100 |
commit | f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c (patch) | |
tree | 8268a378f27e1940a5a76b3c55abf6e4ee0fc256 /dev-util/android-tools/files | |
parent | 7c68db06bb531670c1261374c0133d652b476bd7 (diff) |
gentoo auto-resync : 12:08:2022 - 20:22:37
Diffstat (limited to 'dev-util/android-tools/files')
-rw-r--r-- | dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch | 15 | ||||
-rwxr-xr-x | dev-util/android-tools/files/make-tarballs.sh | 128 |
2 files changed, 0 insertions, 143 deletions
diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch deleted file mode 100644 index aa313daf9042..000000000000 --- a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch +++ /dev/null @@ -1,15 +0,0 @@ -From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001 -From: Mike Lothian <mike@fireburn.co.uk> -Date: Sat, 14 May 2022 02:01:18 +0100 -Subject: [PATCH] Add functional include - ---- a/tls/include/adb/tls/tls_connection.h -+++ b/tls/include/adb/tls/tls_connection.h -@@ -19,6 +19,7 @@ - #include <stddef.h> - #include <stdint.h> - -+#include <functional> - #include <string_view> - #include <vector> - diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh deleted file mode 100755 index 5a0a775c1290..000000000000 --- a/dev-util/android-tools/files/make-tarballs.sh +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/bash -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Create the various tarballs we need. GoB does not provide stable archives (unlike github), -# and some repos are uselessly fat, so we have to create things by hand. Fun times. - -set -e - -die() { - echo "error: $*" >&2 - exit 1 -} - -fetch_boringssl() { - local ver=$1 tag=$2 - local content hash - - echo "checking boringssl in ${tag}" - content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -) - hash=$(echo "${content}" | base64 -d) - echo "using boringssl ${hash}" - - local tar="${DISTDIR}/boringssl-${hash}.tar.gz" - if [[ ! -e ${tar} ]] ; then - # We use github as it provides stable tarballs. GoB does not (includes timestamps). - # https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz - wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}" - fi - - du -h "${tar}" -} - -# The extras repo has ballooned to ~200MB, so we have to strip the large useless -# files and random binaries. -fetch_extras() { - local ver=$1 tag=$2 - local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz" - - if [[ ! -e ${tar} ]] ; then - local prune=( - ioshark - memory_replay - perfprofd - simpleperf - ) - local dir="${tag}-extras" - rm -rf "${dir}" - mkdir "${dir}" - cd "${dir}" - - wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz - tar xf extras.tar.gz - rm -rf "${prune[@]}" extras.tar.gz - - cd .. - tar cf - "${dir}" | xz -9 > "${dir}.tar.xz" - rm -rf "${dir}" - - mv "${dir}.tar.xz" "${tar}" - fi - - du -h "${tar}" -} - -# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink. -fetch_selinux() { - local ver=$1 tag=$2 - local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz" - - if [[ ! -e ${tar} ]] ; then - wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}" - fi - - du -h "${tar}" -} - -# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink. -fetch_f2fs() { - local ver=$1 tag=$2 - local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz" - - if [[ ! -e ${tar} ]] ; then - wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}" - fi - - du -h "${tar}" -} - -usage() { - local status=$1 - - [[ ${status} -eq 1 ]] && exec 1>&2 - - cat <<-EOF - Usage: $0 <android version> - - To find the next available version, consult: - https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools - - They have some helper scripts for building the files directly. - - Example: - $0 android-8.1.0_r1 - EOF - - exit ${status} -} - -main() { - [[ $# -ne 1 ]] && usage 1 - [[ $1 == "-h" || $1 == "--help" ]] && usage 0 - - if [[ -z ${DISTDIR} ]] ; then - eval $(portageq -v envvar DISTDIR) - fi - if [[ -z ${DISTDIR} ]] ; then - die "Please set \$DISTDIR first" - fi - - local ver="${1#android-}" - local tag="android-${ver}" - fetch_boringssl "${ver}" "${tag}" - fetch_extras "${ver}" "${tag}" - fetch_selinux "${ver}" "${tag}" - fetch_f2fs "${ver}" "${tag}" -} -main "$@" |