nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/android.scm
View File

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