diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
| commit | 194451347dc60092132d06b84a83c5205d79299a (patch) | |
| tree | 828475b685c349cdd7b74c09beb7336d38bdf6f0 /gnu/packages/android.scm | |
| parent | 37c6f11f8dfa1880db86a3510c9e50990304d76c (diff) | |
| parent | 8cddb0d6363d13f74de5409ef29b7913228f49b9 (diff) | |
| download | guix-194451347dc60092132d06b84a83c5205d79299a.tar guix-194451347dc60092132d06b84a83c5205d79299a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/android.scm')
| -rw-r--r-- | gnu/packages/android.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 9f8d850ff5..48380740a3 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -108,7 +108,7 @@ use their packages mostly unmodified in our Android NDK build system.") ;; Big thanks to them for laying the groundwork. ;; The version tag is consistent between all repositories. -(define (android-platform-version) "7.1.2_r6") +(define (android-platform-version) "7.1.2_r36") (define (android-platform-system-core version) (origin @@ -120,7 +120,7 @@ use their packages mostly unmodified in our Android NDK build system.") version "-checkout")) (sha256 (base32 - "0xc2n7jxrf1iw9cc278pijdfjix2fkiig5ws27f6rwp40zg5mrgg")) + "1krnc2b9zfkzpdgs1dcbji59nszlx2qr723pg89m52622czc06hg")) (patches (search-patches "libbase-use-own-logging.patch" "libbase-fix-includes.patch" @@ -151,7 +151,7 @@ use their packages mostly unmodified in our Android NDK build system.") version "-checkout")) (sha256 (base32 - "0n9wkz3ynqw39if1ss9n32m66iga14nndf29hpm7g1aqn4wvvgzk")))) + "15r4s20d7vw022f8vrc3jbghmqwdcqzprl7i2bfvdkz8z76wc1ps")))) (define (android-platform-external version subdirectory checksum) (origin @@ -339,6 +339,13 @@ various Android core host applications.") (modify-phases %standard-phases (add-after 'unpack 'enter-source (lambda _ (chdir "adb") #t)) + (add-after 'enter-source 'glibc-compat + (lambda _ + ;; Include sysmacros.h for "major" and "minor" in Glibc 2.28. + (substitute* "usb_linux.cpp" + (("#include <sys/types.h>" all) + (string-append all "\n#include <sys/sysmacros.h>\n"))) + #t)) (add-after 'enter-source 'make-libs-available (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Android.mk" |