02/08: gnu: android-f2fs-utils: Don't disable tests.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 9e8f0ff2a91c97a241284ba064dc3d0462b5005b
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 01:36:53 2018 +0200

gnu: android-f2fs-utils: Don't disable tests.

* gnu/packages/android.scm (android-f2fs-utils): Don't disable tests.
---
gnu/packages/android.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index fe286c2..4c47505 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -516,8 +516,7 @@ Android core.")
(source (android-platform-system-extras version))
(build-system android-ndk-build-system)
(arguments
- `(#:tests? #f ; TODO.
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'enter-source
(lambda _ (chdir "f2fs_utils") #t))

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit b913d1eaf23bf7ed6de24b85dbe18ea129fd2e1d
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 02:41:20 2018 +0200

gnu: fastboot: Enable tests.

* gnu/packages/android.scm (fastboot)[arguments]: Enable tests.
---
gnu/packages/android.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 9a2a990..e9e13a6 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -612,8 +612,7 @@ Android core.")
(lib (string-append out "/lib"))
(bin (string-append out "/bin")))
(install-file "fastboot" bin)
- #t))))
- #:tests? #f)) ; Require network
+ #t))))))
(inputs
`(("adb" ,adb)
("android-safe-iop" ,android-safe-iop)

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit c6ee92c41bfc0bc3b5634651bfa62bf35f2f11b5
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 01:51:08 2018 +0200

gnu: Add android-googletest.

* gnu/packages/android.scm (android-googletest): New variable.
* guix/build-system/android-ndk.scm (android-ndk-build): Use it.
---
gnu/packages/android.scm | 17 +++++++++++++++++
guix/build-system/android-ndk.scm | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 4c47505..eda2433 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -77,6 +77,23 @@
use their packages mostly unmodified in our Android NDK build system.")
(license license:asl2.0)))

+(define-public android-googletest
+ (package (inherit googletest)
+ (name "android-googletest")
+ (arguments
+ `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-host-libraries
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib")))
+ (symlink "libgtest.so"
+ (string-append lib "/libgtest_host.so"))
+ (symlink "libgmock.so"
+ (string-append lib "/libgmock_host.so"))
+ #t))))))))
+
;; The Makefiles that we add are largely based on the Debian
;; packages. They are licensed under GPL-2 and have copyright:
;; 2012, Stefan Handschuh <***@googlemail.com>
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm
index 891fc6e..029f654 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -113,7 +113,7 @@
;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages)))
(build-inputs `(("android-make-stub" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub))
- ("googletest" ,(module-ref (resolve-interface '(gnu packages check)) 'googletest))
+ ("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest))
,@native-inputs))
(outputs outputs)
(build android-ndk-build)

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit d3324a4b3b8f7b46adedfa06f9eb7132d0d240fa
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 01:35:33 2018 +0200

gnu: android-ext4-utils: Don't disable tests.

* gnu/packages/android.scm (android-ext4-utils): Don't disable tests.
---
gnu/packages/android.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 82f6f53..fe286c2 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -464,8 +464,7 @@ that is safe to use for user space. It also includes
(source (android-platform-system-extras version))
(build-system android-ndk-build-system)
(arguments
- `(#:tests? #f ; TODO.
- #:make-flags
+ `(#:make-flags
(list (string-append "CPPFLAGS="
;"-Wno-error "
"-I "

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit cad7c591f0d21360f56edd13887cd60e201e0424
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 02:33:38 2018 +0200

gnu: android-make-stub: Update to 0.5.5.

* gnu/packages/android.scm (android-make-stub): Update to 0.5.5.
---
gnu/packages/android.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 511ec35..9e2ce42 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -46,7 +46,7 @@
(define-public android-make-stub
(package
(name "android-make-stub")
- (version "0.5.4")
+ (version "0.5.5")
(source
(origin
(method git-fetch)
@@ -57,7 +57,7 @@
version "-checkout"))
(sha256
(base32
- "0jg5qalxgbdwva7c5r350fna9baxdbpys21g6x3l2p0wzp01calp"))))
+ "0shm4xvc2v6dn6pxydy6yn64qrrpcvx8ssmym9053wk0w5s9wp9q"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; None exist.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit fff92439b292a6b4fcb22563a1b9fcec37c1a5ca
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 02:38:20 2018 +0200

gnu: fastboot: Simplify package.

* gnu/packages/android.scm (fastboot)[arguments]<#:phases>
[make-googletest-available]: Delete phase.
[inputs]: Remove openssl.
---
gnu/packages/android.scm | 6 ------
1 file changed, 6 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 88961ca..9a2a990 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -606,11 +606,6 @@ Android core.")
(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"))
@@ -634,7 +629,6 @@ Android core.")
("android-libselinux" ,android-libselinux)
("pcre" ,pcre)
("mkbootimg" ,mkbootimg)
- ("openssl" ,openssl) ; FIXME remove
("zlib" ,zlib)))
(native-inputs
`(("core" ,(android-platform-system-core version))

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 7715269e3aa16b6744890036b27791fff93cd3c1
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 02:27:31 2018 +0200

gnu: android-make-stub: Update to 0.5.4.

* gnu/packages/android.scm (android-make-stub): Update to 0.5.4.
---
gnu/packages/android.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index eda2433..511ec35 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -46,7 +46,7 @@
(define-public android-make-stub
(package
(name "android-make-stub")
- (version "0.5.3")
+ (version "0.5.4")
(source
(origin
(method git-fetch)
@@ -57,7 +57,7 @@
version "-checkout"))
(sha256
(base32
- "1q1hx4afca8wxwwf8xka7vngyh7znwpblw5y876p9zvyn84f4ysf"))))
+ "0jg5qalxgbdwva7c5r350fna9baxdbpys21g6x3l2p0wzp01calp"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; None exist.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit cc59bf70975b2ab4224f165709c8be3c661d4cdb
Author: Danny Milosavljevic <***@scratchpost.org>
Date: Thu May 10 02:34:30 2018 +0200

gnu: android-libutils: Add android-liblog.

* gnu/packages/android.scm (android-libutils)[native-inputs]: Add android-liblog.
---
gnu/packages/android.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 9e2ce42..88961ca 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -575,7 +575,8 @@ Android core.")
`(("android-safe-iop" ,android-safe-iop)
("android-libcutils" ,android-libcutils)))
(native-inputs
- `(("android-bionic-uapi" ,android-bionic-uapi)))
+ `(("android-bionic-uapi" ,android-bionic-uapi)
+ ("android-liblog" ,android-liblog)))
(home-page "https://developer.android.com/")
(synopsis "Android utility library")
(description "@code{android-libutils} provides utilities for Android NDK developers.")