mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: Patch Android system core at the origin.
* gnu/packages/android.scm (android-platform-system-core): Add patches. (libbase): Remove patches. (adb): Remove patches.
This commit is contained in:
parent
ad23a3fbab
commit
b98d447818
1 changed files with 7 additions and 12 deletions
|
@ -95,7 +95,11 @@ (define (android-platform-system-core version)
|
||||||
version "-checkout"))
|
version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0xc2n7jxrf1iw9cc278pijdfjix2fkiig5ws27f6rwp40zg5mrgg"))))
|
"0xc2n7jxrf1iw9cc278pijdfjix2fkiig5ws27f6rwp40zg5mrgg"))
|
||||||
|
(patches
|
||||||
|
(search-patches "libbase-use-own-logging.patch"
|
||||||
|
"libbase-fix-includes.patch"
|
||||||
|
"adb-add-libraries.patch"))))
|
||||||
|
|
||||||
(define liblog
|
(define liblog
|
||||||
(package
|
(package
|
||||||
|
@ -122,11 +126,7 @@ (define libbase
|
||||||
(package
|
(package
|
||||||
(name "libbase")
|
(name "libbase")
|
||||||
(version (android-platform-version))
|
(version (android-platform-version))
|
||||||
(source (origin
|
(source (android-platform-system-core version))
|
||||||
(inherit (android-platform-system-core version))
|
|
||||||
(patches
|
|
||||||
(search-patches "libbase-use-own-logging.patch"
|
|
||||||
"libbase-fix-includes.patch"))))
|
|
||||||
(build-system android-ndk-build-system)
|
(build-system android-ndk-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; TODO.
|
`(#:tests? #f ; TODO.
|
||||||
|
@ -197,12 +197,7 @@ (define-public adb
|
||||||
(package
|
(package
|
||||||
(name "adb")
|
(name "adb")
|
||||||
(version (android-platform-version))
|
(version (android-platform-version))
|
||||||
(source (origin
|
(source (android-platform-system-core version))
|
||||||
(inherit (android-platform-system-core version))
|
|
||||||
(patches
|
|
||||||
(search-patches "libbase-use-own-logging.patch"
|
|
||||||
"libbase-fix-includes.patch"
|
|
||||||
"adb-add-libraries.patch"))))
|
|
||||||
(build-system android-ndk-build-system)
|
(build-system android-ndk-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; TODO.
|
`(#:tests? #f ; TODO.
|
||||||
|
|
Loading…
Reference in a new issue