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

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

* gnu/packages/android.scm (libcutils): Rename to...
(android-libcutils): ...this.
This commit is contained in:
Danny Milosavljevic 2018-05-09 22:27:34 +02:00
parent 01a2389a66
commit 3385db349f
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/android.scm
View File

@ -189,9 +189,9 @@ in Main, System, Radio and Events sub-logs.")
various Android core host applications.") various Android core host applications.")
(license license:asl2.0))) (license license:asl2.0)))
(define libcutils (define android-libcutils
(package (package
(name "libcutils") (name "android-libcutils")
(version (android-platform-version)) (version (android-platform-version))
(source (android-platform-system-core version)) (source (android-platform-system-core version))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -321,7 +321,7 @@ various Android core host applications.")
#t))))) #t)))))
(inputs (inputs
`(("android-libbase" ,android-libbase) `(("android-libbase" ,android-libbase)
("libcutils" ,libcutils) ("android-libcutils" ,android-libcutils)
("android-liblog" ,android-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")
@ -475,7 +475,7 @@ that is safe to use for user space. It also includes
"/include " "/include "
"-I " (assoc-ref %build-inputs "android-libsparse") "-I " (assoc-ref %build-inputs "android-libsparse")
"/include " "/include "
"-I " (assoc-ref %build-inputs "libcutils") "-I " (assoc-ref %build-inputs "android-libcutils")
"/include " "/include "
"-I " (assoc-ref %build-inputs "android-liblog") "/include " "-I " (assoc-ref %build-inputs "android-liblog") "/include "
"-I ../core/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"))) (copy-recursively "." (string-append out "/include")))
#t))))) #t)))))
(inputs (inputs
`(("libcutils" ,libcutils) `(("android-libcutils" ,android-libcutils)
("android-liblog" ,android-liblog) ("android-liblog" ,android-liblog)
("android-libselinux" ,android-libselinux) ("android-libselinux" ,android-libselinux)
("android-libsparse" ,android-libsparse) ("android-libsparse" ,android-libsparse)
@ -533,7 +533,7 @@ Android core.")
`(("f2fs-tools" ,f2fs-tools-1.7) `(("f2fs-tools" ,f2fs-tools-1.7)
("android-libselinux" ,android-libselinux) ("android-libselinux" ,android-libselinux)
("android-libsparse" ,android-libsparse) ("android-libsparse" ,android-libsparse)
("libcutils" ,libcutils) ("android-libcutils" ,android-libcutils)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://developer.android.com/") (home-page "https://developer.android.com/")
(synopsis "Android ext4 utils") (synopsis "Android ext4 utils")
@ -560,7 +560,7 @@ Android core.")
(copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils"))))))) (copy-recursively "../include/utils" (string-append (assoc-ref outputs "out") "/include/utils")))))))
(inputs (inputs
`(("android-safe-iop" ,android-safe-iop) `(("android-safe-iop" ,android-safe-iop)
("libcutils" ,libcutils))) ("android-libcutils" ,android-libcutils)))
(native-inputs (native-inputs
`(("android-bionic-uapi" ,android-bionic-uapi))) `(("android-bionic-uapi" ,android-bionic-uapi)))
(home-page "https://developer.android.com/") (home-page "https://developer.android.com/")
@ -612,7 +612,7 @@ Android core.")
("android-f2fs-utils" ,android-f2fs-utils) ("android-f2fs-utils" ,android-f2fs-utils)
("googletest" ,googletest) ("googletest" ,googletest)
("android-libbase" ,android-libbase) ("android-libbase" ,android-libbase)
("libcutils" ,libcutils) ("android-libcutils" ,android-libcutils)
("android-liblog" ,android-liblog) ("android-liblog" ,android-liblog)
("android-libutils" ,android-libutils) ("android-libutils" ,android-libutils)
("android-libsparse" ,android-libsparse) ("android-libsparse" ,android-libsparse)