gnu: Rename "liblog" to "android-liblog".

* gnu/packages/android.scm (liblog): Rename to...
(android-liblog): ...this.
This commit is contained in:
Danny Milosavljevic 2018-05-09 22:25:10 +02:00
parent 455b8fed7e
commit 8272e5e0b7
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5

View file

@ -143,9 +143,9 @@ (define (android-platform-external version subdirectory checksum)
(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 @@ (define libbase
(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 @@ (define-public adb
(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 @@ (define-public android-ext4-utils
"/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 @@ (define-public android-ext4-utils
#t)))))
(inputs
`(("libcutils" ,libcutils)
("liblog" ,liblog)
("android-liblog" ,android-liblog)
("android-libselinux" ,android-libselinux)
("android-libsparse" ,android-libsparse)
("zlib" ,zlib)))
@ -613,7 +613,7 @@ (define-public fastboot
("googletest" ,googletest)
("libbase" ,libbase)
("libcutils" ,libcutils)
("liblog" ,liblog)
("android-liblog" ,android-liblog)
("android-libutils" ,android-libutils)
("android-libsparse" ,android-libsparse)
("android-libziparchive" ,android-libziparchive)