[bug#31393] [PATCH 0/4] Add android-fastboot and rename packages.

[bug#31393] [PATCH 0/4] Add android-fastboot and rename packages.

[Danny Milosavljevic]

Danny Milosavljevic (4):
  gnu: Add android-fastboot.
  gnu: Rename "liblog" to "android-liblog".
  gnu: Rename "libbase" to "android-libbase".
  gnu: Rename "libcutils" to "android-libcutils".

 gnu/packages/android.scm | 96 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 16 deletions(-)

[bug#31393] [PATCH 1/4] gnu: Add android-fastboot.

[Danny Milosavljevic]

* gnu/packages/android.scm (android-fastboot): New variable.
---
 gnu/packages/android.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 2e5f1d593..eaae0229a 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -568,6 +568,70 @@ Android core.")
     (description "@code{android-libutils} provides utilities for Android NDK developers.")
     (license license:asl2.0)))
 
+(define-public android-fastboot
+  (package
+    (name "android-fastboot")
+    (version (android-platform-version))
+    (source #f)
+    (build-system android-ndk-build-system)
+    (arguments
+     `(#:make-flags (list "CXXFLAGS=-std=gnu++11")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'unpack
+           (lambda* (#:key inputs #:allow-other-keys)
+             (mkdir-p "core")
+             (with-directory-excursion "core"
+               (invoke "tar" "axf" (assoc-ref inputs "core") "--strip-components=1")
+               (substitute* "fastboot/Android.mk"
+                (("libext4_utils_host") "libext4_utils_host libselinux libpcre")))
+             (copy-recursively (assoc-ref inputs "extras") "extras"
+                               #:keep-mtime? #t)
+             #t))
+         (add-after 'unpack 'enter-source
+           (lambda _
+             (chdir "core/fastboot")
+             #t))
+         (add-after 'enter-source 'make-googletest-available
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((googletest (assoc-ref inputs "googletest")))
+               (symlink (string-append googletest "/lib/libgtest.so") "libgtest_host.so")
+               #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))))
+       #:tests? #f))
+    (inputs
+     `(("adb" ,adb)
+       ("android-safe-iop" ,android-safe-iop)
+       ("android-ext4-utils" ,android-ext4-utils)
+       ("android-f2fs-utils" ,android-f2fs-utils)
+       ("googletest" ,googletest)
+       ("libbase" ,libbase)
+       ("libcutils" ,libcutils)
+       ("liblog" ,liblog)
+       ("android-libutils" ,android-libutils)
+       ("android-libsparse" ,android-libsparse)
+       ("android-libziparchive" ,android-libziparchive)
+       ("android-libselinux" ,android-libselinux)
+       ("pcre" ,pcre)
+       ("mkbootimg" ,mkbootimg)
+       ("openssl" ,openssl) ; FIXME remove
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("core" ,(android-platform-system-core version))
+       ("extras" ,(android-platform-system-extras version))
+       ("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")

[bug#31393] [PATCH 2/4] gnu: Rename "liblog" to "android-liblog".

[Danny Milosavljevic]

* gnu/packages/android.scm (liblog): Rename to...
(android-liblog): ...this.
---
 gnu/packages/android.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index eaae0229a..db5a00298 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -143,9 +143,9 @@ use their packages mostly unmodified in our Android NDK build system.")
      (base32
       checksum))))
 
-(define liblog
+(define android-liblog
   (package
-    (name "liblog")
+    (name "android-liblog")
     (version (android-platform-version))
     (source (android-platform-system-core version))
     (build-system android-ndk-build-system)
@@ -182,7 +182,7 @@ in Main, System, Radio and Events sub-logs.")
        (modify-phases %standard-phases
          (add-after 'unpack 'enter-source
            (lambda _ (chdir "base") #t)))))
-    (inputs `(("liblog" ,liblog)))
+    (inputs `(("android-liblog" ,android-liblog)))
     (home-page "https://developer.android.com/")
     (synopsis "Android platform base library")
     (description "@code{libbase} is a library in common use by the
@@ -322,7 +322,7 @@ various Android core host applications.")
     (inputs
      `(("libbase" ,libbase)
        ("libcutils" ,libcutils)
-       ("liblog" ,liblog)
+       ("android-liblog" ,android-liblog)
        ("openssl" ,openssl)))
     (home-page "https://developer.android.com/studio/command-line/adb.html")
     (synopsis "Android Debug Bridge")
@@ -477,7 +477,7 @@ that is safe to use for user space.  It also includes
                             "/include "
                             "-I " (assoc-ref %build-inputs "libcutils")
                             "/include "
-                            "-I " (assoc-ref %build-inputs "liblog") "/include "
+                            "-I " (assoc-ref %build-inputs "android-liblog") "/include "
                             "-I ../core/include")
              "CFLAGS=-Wno-error"
              "install-libext4_utils_host.a"
@@ -500,7 +500,7 @@ that is safe to use for user space.  It also includes
              #t)))))
     (inputs
      `(("libcutils" ,libcutils)
-       ("liblog" ,liblog)
+       ("android-liblog" ,android-liblog)
        ("android-libselinux" ,android-libselinux)
        ("android-libsparse" ,android-libsparse)
        ("zlib" ,zlib)))
@@ -613,7 +613,7 @@ Android core.")
        ("googletest" ,googletest)
        ("libbase" ,libbase)
        ("libcutils" ,libcutils)
-       ("liblog" ,liblog)
+       ("android-liblog" ,android-liblog)
        ("android-libutils" ,android-libutils)
        ("android-libsparse" ,android-libsparse)
        ("android-libziparchive" ,android-libziparchive)

[bug#31393] [PATCH 3/4] gnu: Rename "libbase" to "android-libbase".

[Danny Milosavljevic]

* gnu/packages/android.scm (libbase): Rename to...
(android-libbase): ...this.
---
 gnu/packages/android.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index db5a00298..563ed32ea 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -169,9 +169,9 @@ interfaces for either writing or reading logs.  The log buffers are divided up
 in Main, System, Radio and Events sub-logs.")
     (license license:asl2.0)))
 
-(define libbase
+(define android-libbase
   (package
-    (name "libbase")
+    (name "android-libbase")
     (version (android-platform-version))
     (source (android-platform-system-core version))
     (build-system android-ndk-build-system)
@@ -320,7 +320,7 @@ various Android core host applications.")
              (install-file "diagnose_usb.h" (string-append (assoc-ref outputs "out") "/include"))
              #t)))))
     (inputs
-     `(("libbase" ,libbase)
+     `(("android-libbase" ,android-libbase)
        ("libcutils" ,libcutils)
        ("android-liblog" ,android-liblog)
        ("openssl" ,openssl)))
@@ -611,7 +611,7 @@ Android core.")
        ("android-ext4-utils" ,android-ext4-utils)
        ("android-f2fs-utils" ,android-f2fs-utils)
        ("googletest" ,googletest)
-       ("libbase" ,libbase)
+       ("android-libbase" ,android-libbase)
        ("libcutils" ,libcutils)
        ("android-liblog" ,android-liblog)
        ("android-libutils" ,android-libutils)

[bug#31393] [PATCH 4/4] gnu: Rename "libcutils" to "android-libcutils".

[Danny Milosavljevic]

* gnu/packages/android.scm (libcutils): Rename to...
(android-libcutils): ...this.
---
 gnu/packages/android.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 563ed32ea..6f68f583c 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -189,9 +189,9 @@ in Main, System, Radio and Events sub-logs.")
 various Android core host applications.")
     (license license:asl2.0)))
 
-(define libcutils
+(define android-libcutils
   (package
-    (name "libcutils")
+    (name "android-libcutils")
     (version (android-platform-version))
     (source (android-platform-system-core version))
     (build-system gnu-build-system)
@@ -321,7 +321,7 @@ various Android core host applications.")
              #t)))))
     (inputs
      `(("android-libbase" ,android-libbase)
-       ("libcutils" ,libcutils)
+       ("android-libcutils" ,android-libcutils)
        ("android-liblog" ,android-liblog)
        ("openssl" ,openssl)))
     (home-page "https://developer.android.com/studio/command-line/adb.html")
@@ -475,7 +475,7 @@ that is safe to use for user space.  It also includes
                             "/include "
                             "-I " (assoc-ref %build-inputs "android-libsparse")
                             "/include "
-                            "-I " (assoc-ref %build-inputs "libcutils")
+                            "-I " (assoc-ref %build-inputs "android-libcutils")
                             "/include "
                             "-I " (assoc-ref %build-inputs "android-liblog") "/include "
                             "-I ../core/include")
@@ -499,7 +499,7 @@ that is safe to use for user space.  It also includes
                (copy-recursively "." (string-append out "/include")))
              #t)))))
     (inputs
-     `(("libcutils" ,libcutils)
+     `(("android-libcutils" ,android-libcutils)
        ("android-liblog" ,android-liblog)
        ("android-libselinux" ,android-libselinux)
        ("android-libsparse" ,android-libsparse)
@@ -533,7 +533,7 @@ Android core.")
      `(("f2fs-tools" ,f2fs-tools-1.7)
        ("android-libselinux" ,android-libselinux)
        ("android-libsparse" ,android-libsparse)
-       ("libcutils" ,libcutils)
+       ("android-libcutils" ,android-libcutils)
        ("zlib" ,zlib)))
     (home-page "https://developer.android.com/")
     (synopsis "Android ext4 utils")
@@ -560,7 +560,7 @@ Android core.")
              (copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils")))))))
     (inputs
      `(("android-safe-iop" ,android-safe-iop)
-       ("libcutils" ,libcutils)))
+       ("android-libcutils" ,android-libcutils)))
     (native-inputs
      `(("android-bionic-uapi" ,android-bionic-uapi)))
     (home-page "https://developer.android.com/")
@@ -612,7 +612,7 @@ Android core.")
        ("android-f2fs-utils" ,android-f2fs-utils)
        ("googletest" ,googletest)
        ("android-libbase" ,android-libbase)
-       ("libcutils" ,libcutils)
+       ("android-libcutils" ,android-libcutils)
        ("android-liblog" ,android-liblog)
        ("android-libutils" ,android-libutils)
        ("android-libsparse" ,android-libsparse)

[bug#31393] [PATCH 0/4] Add android-fastboot and rename packages.

[Julien Lepiller]

Le Wed,  9 May 2018 22:39:47 +0200,
Danny Milosavljevic <dannym@scratchpost.org> a écrit :

> Danny Milosavljevic (4):
>   gnu: Add android-fastboot.
>   gnu: Rename "liblog" to "android-liblog".
>   gnu: Rename "libbase" to "android-libbase".
>   gnu: Rename "libcutils" to "android-libcutils".
> 
>  gnu/packages/android.scm | 96
> ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 80
> insertions(+), 16 deletions(-)

I haven't tested your patches, but if they work, LGTM!

Could you simply add a comment to explain why you don't run tests (I
guess there aren't any). Also, I'm not sure about the name of the
android-fastboot package. Since it provides the fastboot command, I
think the convention is to call it fastboot, like adb is not
android-adb.

bug#31393: [PATCH 0/4] Add android-fastboot and rename packages.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 573 bytes --]

Hi Julien,

On Wed, 9 May 2018 22:53:23 +0200
Julien Lepiller <julien@lepiller.eu> wrote:

> Could you simply add a comment to explain why you don't run tests (I
> guess there aren't any).

I didn't have the building of the tests implemented yet.  I do now :)

> Also, I'm not sure about the name of the
> android-fastboot package. Since it provides the fastboot command, I
> think the convention is to call it fastboot, like adb is not
> android-adb.

Okay!

Pushed to master.

Fastboot works now - and a few packages have tests enabled now.  Phiew...

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]