Subject: [bug#49859] [PATCH 3/6] gnu: Remove adb and fastboot.

From: Leo Famulari <[email-masked]>
Date: Tue, 3 Aug 2021 21:20:46 -0400

As discussed in <https://bugs.gnu.org/46602>, this version of adb does
not support a current release of OpenSSL.

* gnu/packages/android.scm (adb, fastboot): Remove variables.
---
 gnu/packages/android.scm | 95 ----------------------------------------
 1 file changed, 95 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index eb538f6540..746a104d43 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -351,53 +351,6 @@ various Android core host applications.")
 various Android core host applications.")
     (license license:asl2.0)))
 
-(define-public adb
-  (package
-    (name "adb")
-    (version (android-platform-version))
-    (source (android-platform-system-core version))
-    (build-system android-ndk-build-system)
-    (arguments
-     `(#:tests? #f ; Test failure: sysdeps_poll.fd_count
-       #:make-flags
-       (list "CFLAGS=-Wno-error"
-             "CXXFLAGS=-fpermissive -Wno-error -std=gnu++14 -D_Nonnull= -D_Nullable= -I ."
-             (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib "
-                            "-Wl,-rpath=" (assoc-ref %build-inputs "openssl") "/lib -L ."))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'enter-source
-           (lambda _ (chdir "adb") #t))
-         (add-after 'enter-source 'glibc-compat
-           (lambda _
-             ;; Include sysmacros.h for "major" and "minor" in Glibc 2.28.
-             (substitute* "usb_linux.cpp"
-               (("#include <sys/types.h>" all)
-                (string-append all "\n#include <sys/sysmacros.h>\n")))
-             #t))
-         (add-after 'enter-source 'make-libs-available
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* "Android.mk"
-              (("libcrypto_static") "libcrypto"))
-             #t))
-         (add-after 'install 'install-headers
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (install-file "diagnose_usb.h" (string-append (assoc-ref outputs "out") "/include"))
-             #t)))))
-    (inputs
-     `(("android-libbase" ,android-libbase)
-       ("android-libcutils" ,android-libcutils)
-       ("android-liblog" ,android-liblog)
-       ("openssl" ,openssl-1.0)))
-    (home-page "https://developer.android.com/studio/command-line/adb.html")
-    (synopsis "Android Debug Bridge")
-    (description
-     "@command{adb} is a versatile command line tool that lets you communicate
-with an emulator instance or connected Android device.  It facilitates a variety
-of device actions, such as installing and debugging apps, and it provides access
-to a Unix shell that can run commands on the connected device or emulator.")
-    (license license:asl2.0)))
-
 (define-public mkbootimg
   (package
     (name "mkbootimg")
@@ -652,54 +605,6 @@ file system.")
     (description "@code{android-libutils} provides utilities for Android NDK developers.")
     (license license:asl2.0)))
 
-(define-public fastboot
-  (package
-    (name "fastboot")
-    (version (android-platform-version))
-    (source (android-platform-system-core version))
-    (build-system android-ndk-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'enter-source
-           (lambda _
-             (chdir "fastboot")
-             #t))
-         (add-after 'enter-source 'patch-source
-           (lambda _
-             (substitute* "Android.mk"
-              (("libext4_utils_host") "libext4_utils_host libselinux libpcre"))
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (lib (string-append out "/lib"))
-                    (bin (string-append out "/bin")))
-               (install-file "fastboot" bin)
-               #t))))))
-    (inputs
-     `(("adb" ,adb)
-       ("android-safe-iop" ,android-safe-iop)
-       ("android-ext4-utils" ,android-ext4-utils)
-       ("android-f2fs-utils" ,android-f2fs-utils)
-       ("android-libbase" ,android-libbase)
-       ("android-libcutils" ,android-libcutils)
-       ("android-liblog" ,android-liblog)
-       ("android-libutils" ,android-libutils)
-       ("android-libsparse" ,android-libsparse)
-       ("android-libziparchive" ,android-libziparchive)
-       ("android-libselinux" ,android-libselinux)
-       ("pcre" ,pcre)
-       ("mkbootimg" ,mkbootimg)
-       ("zlib" ,zlib)))
-    (native-inputs
-     `(("xz" ,xz)))
-    (home-page "https://developer.android.com/studio/command-line/")
-    (synopsis "Android image flasher")
-    (description
-     "This package provides @command{fastboot}, a tool to upload file system images to Android devices.")
-    (license license:asl2.0)))
-
 (define-public android-udev-rules
   (package
     (name "android-udev-rules")
-- 
2.32.0