aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-05-09 22:25:10 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-05-10 01:06:21 +0200
commit8272e5e0b77760bb89f01815a89326f59b360c0e (patch)
tree1bcce93ac406becfd35e45ac787d64e37fa2937a
parent455b8fed7e0af287e433232f0edf59e26c6e5f4f (diff)
downloadguix-8272e5e0b77760bb89f01815a89326f59b360c0e.tar
guix-8272e5e0b77760bb89f01815a89326f59b360c0e.tar.gz
gnu: Rename "liblog" to "android-liblog".
* gnu/packages/android.scm (liblog): Rename to... (android-liblog): ...this.
-rw-r--r--gnu/packages/android.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index c3beba6155..bc679a1777 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)