diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 334626b93ac..9892b386d00 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -763,14 +763,14 @@ August 15, 2011 - + google Google Inc. google_apis Google APIs Android + Google APIs 15 - 2 + 3 com.google.android.maps @@ -784,23 +784,23 @@ August 15, 2011 - 106612472 - 6757c12788da0ea00c2ab58e54cb438b9f2bcf66 - google_apis-15_r02.zip + 106624396 + d0d2bf26805eb271693570a1aaec33e7dc3f45e9 + google_apis-15_r03.zip - + google Google Inc. google_apis Google APIs Android + Google APIs 16 - 3 + 4 com.google.android.maps @@ -814,23 +814,23 @@ August 15, 2011 - 127278413 - 63467dd32f471e3e81e33e9772c22f33235aa3b3 - google_apis-16_r03.zip + 127341982 + ee6acf1b01020bfa8a8e24725dbc4478bee5e792 + google_apis-16_r04.zip - + google Google Inc. google_apis Google APIs Android + Google APIs 17 - 3 + 4 com.google.android.maps @@ -844,23 +844,23 @@ August 15, 2011 - 137156978 - 8246f61d24f0408c8e7bc352a1e522b7e2b619ba - google_apis-17_r03.zip + 137231243 + a076be0677f38df8ca5536b44dfb411a0c808c4f + google_apis-17_r04.zip - + google Google Inc. google_apis Google APIs Android + Google APIs 18 - 3 + 4 com.google.android.maps @@ -874,23 +874,23 @@ August 15, 2011 - 143149689 - 147bce09c1163edc17194f3db496ec1086fcf965 - google_apis-18_r03.zip + 143195183 + 6109603409debdd40854d4d4a92eaf8481462c8b + google_apis-18_r04.zip - + google Google Inc. google_apis Google APIs (ARM System Image) Android + Google APIs 19 - 13 + 16 com.google.android.maps @@ -904,9 +904,9 @@ August 15, 2011 - 181034400 - 75c8af27f1fdf83dc28057537b5bd62b794365cc - google_apis-19_r13.zip + 182452246 + d92f2a2fe219e578633c6445397e1f675edc6a28 + google_apis-19_r16.zip @@ -997,13 +997,32 @@ August 15, 2011 + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 23 + 1 + + + + 179900 + 04c5cc1a7c88967250ebba9561d81e24104167db + google_apis-23_r01.zip + + + + - + - 22 - 1 + 23 + 0 1 Android @@ -1013,18 +1032,18 @@ August 15, 2011 compatibility - 8475991 - 88bdc7b4074065ed28681f39e6b32c4f7ab45d94 - support_r22.1.1.zip + 9553739 + fbe529716943053d0ce0d7f058d79f1a848cdff9 + support_r23.0.1.zip - + - 14 + 21 Android android @@ -1033,9 +1052,9 @@ August 15, 2011 m2repository - 68533453 - 0011dfe1473ccdfb1a533a19cad152c59dcd6b45 - android_m2repository_r14.zip + 142136028 + acb915c5d2c730bf98303c0cd0122bedb2954cb3 + android_m2repository_r21.zip @@ -1049,15 +1068,15 @@ August 15, 2011 Google Repository m2repository - 17 + 22 Local Maven repository for Google Libraries - 43508126 - a91a809149b69fab1efb4652c21b439e8b9e7150 - google_m2repository_r17.zip + 59491846 + 4c114ac217f4b2f066d731ce906eeb635ee2a5b4 + google_m2repository_r22.zip @@ -1131,16 +1150,16 @@ August 15, 2011 Google Play services google_play_services - 24 + 27 Google Play services client library and sample code https://developers.google.com/android/google-play-services/index - 17636517 - 9dc5092c1043d6d9c162d481e668b95fc2f36782 - google_play_services_7327000_r24.zip + 21163425 + cdb13f826ca82d3c3730cf1df9f3bf58565fd4bb + google_play_services_8115000_r27.zip @@ -1290,4 +1309,40 @@ August 15, 2011 + + + google + Google Inc. + Android Auto Desktop Head Unit emulator + auto + + 1 + 0 + + + Head unit emulator for developers targeting the Android Auto platform. + + http://developer.android.com/tools/help/desktop-head-unit.html + + + 1346136 + e054563f9efdc2f6089693566bce5b8fba2cd1c6 + extras/auto/desktop-head-unit-linux_r01.zip + linux + + + 2691813 + 499bb4520f95e708585947c9fc72efeeb610685f + extras/auto/desktop-head-unit-windows_r01.zip + windows + + + 2389261 + 64510b97c3c2c6dccab7932a816a20b84d9a5dc3 + extras/auto/desktop-head-unit-macosx_r01.zip + macosx + + + + diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index ca4870cf4c8..d397cd766fb 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -19,7 +19,7 @@ in google_apis_3 = buildGoogleApis { name = "google_apis-3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-3-r03.zip; + url = https://dl.google.com/android/repository/google_apis-3-r03.zip; sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; }; meta = { @@ -31,7 +31,7 @@ in google_apis_4 = buildGoogleApis { name = "google_apis-4"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-4_r02.zip; + url = https://dl.google.com/android/repository/google_apis-4_r02.zip; sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; }; meta = { @@ -43,7 +43,7 @@ in google_apis_5 = buildGoogleApis { name = "google_apis-5"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-5_r01.zip; + url = https://dl.google.com/android/repository/google_apis-5_r01.zip; sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; }; meta = { @@ -55,7 +55,7 @@ in google_apis_6 = buildGoogleApis { name = "google_apis-6"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-6_r01.zip; + url = https://dl.google.com/android/repository/google_apis-6_r01.zip; sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; }; meta = { @@ -67,7 +67,7 @@ in google_apis_7 = buildGoogleApis { name = "google_apis-7"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-7_r01.zip; + url = https://dl.google.com/android/repository/google_apis-7_r01.zip; sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; }; meta = { @@ -79,7 +79,7 @@ in google_apis_8 = buildGoogleApis { name = "google_apis-8"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-8_r02.zip; + url = https://dl.google.com/android/repository/google_apis-8_r02.zip; sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; }; meta = { @@ -91,7 +91,7 @@ in google_apis_9 = buildGoogleApis { name = "google_apis-9"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-9_r02.zip; + url = https://dl.google.com/android/repository/google_apis-9_r02.zip; sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; }; meta = { @@ -103,7 +103,7 @@ in google_apis_10 = buildGoogleApis { name = "google_apis-10"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-10_r02.zip; + url = https://dl.google.com/android/repository/google_apis-10_r02.zip; sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; }; meta = { @@ -115,7 +115,7 @@ in google_apis_11 = buildGoogleApis { name = "google_apis-11"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-11_r01.zip; + url = https://dl.google.com/android/repository/google_apis-11_r01.zip; sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; }; meta = { @@ -127,7 +127,7 @@ in google_apis_12 = buildGoogleApis { name = "google_apis-12"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-12_r01.zip; + url = https://dl.google.com/android/repository/google_apis-12_r01.zip; sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; }; meta = { @@ -139,7 +139,7 @@ in google_apis_13 = buildGoogleApis { name = "google_apis-13"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-13_r01.zip; + url = https://dl.google.com/android/repository/google_apis-13_r01.zip; sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; }; meta = { @@ -151,7 +151,7 @@ in google_apis_14 = buildGoogleApis { name = "google_apis-14"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-14_r02.zip; + url = https://dl.google.com/android/repository/google_apis-14_r02.zip; sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; }; meta = { @@ -163,8 +163,8 @@ in google_apis_15 = buildGoogleApis { name = "google_apis-15"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-15_r02.zip; - sha1 = "6757c12788da0ea00c2ab58e54cb438b9f2bcf66"; + url = https://dl.google.com/android/repository/google_apis-15_r03.zip; + sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; }; meta = { description = "Android + Google APIs"; @@ -175,8 +175,8 @@ in google_apis_16 = buildGoogleApis { name = "google_apis-16"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-16_r03.zip; - sha1 = "63467dd32f471e3e81e33e9772c22f33235aa3b3"; + url = https://dl.google.com/android/repository/google_apis-16_r04.zip; + sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; }; meta = { description = "Android + Google APIs"; @@ -187,8 +187,8 @@ in google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip; - sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba"; + url = https://dl.google.com/android/repository/google_apis-17_r04.zip; + sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; }; meta = { description = "Android + Google APIs"; @@ -199,8 +199,8 @@ in google_apis_18 = buildGoogleApis { name = "google_apis-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-18_r03.zip; - sha1 = "147bce09c1163edc17194f3db496ec1086fcf965"; + url = https://dl.google.com/android/repository/google_apis-18_r04.zip; + sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; }; meta = { description = "Android + Google APIs"; @@ -211,8 +211,8 @@ in google_apis_19 = buildGoogleApis { name = "google_apis-19"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-19_r13.zip; - sha1 = "75c8af27f1fdf83dc28057537b5bd62b794365cc"; + url = https://dl.google.com/android/repository/google_apis-19_r16.zip; + sha1 = "d92f2a2fe219e578633c6445397e1f675edc6a28"; }; meta = { description = "Android + Google APIs"; @@ -223,7 +223,7 @@ in google_apis_21 = buildGoogleApis { name = "google_apis-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-21_r01.zip; + url = https://dl.google.com/android/repository/google_apis-21_r01.zip; sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; }; meta = { @@ -235,7 +235,7 @@ in google_apis_22 = buildGoogleApis { name = "google_apis-22"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-22_r01.zip; + url = https://dl.google.com/android/repository/google_apis-22_r01.zip; sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; }; meta = { @@ -244,11 +244,23 @@ in }; }; + google_apis_23 = buildGoogleApis { + name = "google_apis-23"; + src = fetchurl { + url = https://dl.google.com/android/repository/google_apis-23_r01.zip; + sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r22.1.1.zip; - sha1 = "88bdc7b4074065ed28681f39e6b32c4f7ab45d94"; + url = https://dl.google.com/android/repository/support_r23.0.1.zip; + sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9"; }; meta = { description = "Android Support Library"; @@ -259,8 +271,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_play_services_7327000_r24.zip; - sha1 = "9dc5092c1043d6d9c162d481e668b95fc2f36782"; + url = https://dl.google.com/android/repository/google_play_services_8115000_r27.zip; + sha1 = "cdb13f826ca82d3c3730cf1df9f3bf58565fd4bb"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 52b146b87f4..bc994603ab4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -5,20 +5,20 @@ , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib , freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils }: -{platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}: +{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.1.2"; + version = "24.3.4"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - sha1 = "a46298bjpgzsnchhpcm1i86c4r50x638"; + sha1 = "fb293d7bca42e05580be56b1adc22055d46603dd"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "as109624lgrn8krylmyvm33yapqkzr00"; + sha1 = "128f10fba668ea490cc94a08e505a48a608879b9"; } else throw "platform not ${stdenv.system} supported!"; diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 3a7df3ce1af..a73eae3f50c 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation rec { - version="22.0.1"; + version = "23.0.1"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha1 = "8sb05s9f1h03qa7hdj72jffy7rf9r2ys"; + url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; + sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://dl-ssl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha1 = "pxdwrz6bb8b13fknf6qm67g013vdgnjk"; + url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; + sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; } else throw "System ${stdenv.system} not supported!"; @@ -30,28 +30,28 @@ stdenv.mkDerivation rec { done # These binaries need to find libstdc++ and libgcc_s - for i in aidl libLLVM.so + for i in aidl lib/libLLVM.so do patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i done # These binaries need to find libstdc++, libgcc_s and libraries in the current folder - for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc + for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so llvm-rs-cc do - patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd` $i + patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd`/lib $i done # These binaries also need zlib in addition to libstdc++ for i in zipalign do patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i + patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib:`pwd`/lib $i done # These binaries need to find libstdc++, libgcc_s, and zlib for i in aapt dexdump do - patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i + patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib:`pwd`/lib $i done ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 693a53cf428..691c301ebc2 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -167,7 +167,6 @@ rec { inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; inherit platformTools; }; - buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant gnumake gawk file which; diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh index 92abb18f25f..c14c060fc67 100755 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ b/pkgs/development/mobile/androidenv/fetch.sh @@ -5,9 +5,9 @@ android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O # we skip the intel addons, as they are Windows+osX only # we skip the default sys-img (arm?) because it is empty -curl -o repository-10.xml https://dl-ssl.google.com/android/repository/repository-10.xml -curl -o addon.xml https://dl-ssl.google.com/android/repository/addon.xml -curl -o sys-img.xml https://dl-ssl.google.com/android/repository/sys-img/android/sys-img.xml +curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml +curl -o addon.xml https://dl.google.com/android/repository/addon.xml +curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/android/sys-img.xml ./generate-addons.sh ./generate-platforms.sh diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl index a43731fdd08..9658088c7fb 100644 --- a/pkgs/development/mobile/androidenv/generate-addons.xsl +++ b/pkgs/development/mobile/androidenv/generate-addons.xsl @@ -25,7 +25,7 @@ in google_apis_ = buildGoogleApis { name = "-"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; + url = https://dl.google.com/android/repository/; sha1 = ""; }; meta = { @@ -39,7 +39,7 @@ in android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; + url = https://dl.google.com/android/repository/; sha1 = ""; }; meta = { @@ -51,7 +51,7 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/; + url = https://dl.google.com/android/repository/; sha1 = ""; }; meta = { diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh index 58d3ba58d37..ce89f6a8036 100755 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ b/pkgs/development/mobile/androidenv/generate-platforms.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -xsltproc --stringparam os linux generate-platforms.xsl repository-10.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-10.xml > platforms-macosx.nix +xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix +xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index 7851f4899bf..1c80cde5bb3 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -1,7 +1,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/11"> @@ -13,7 +13,7 @@ - https://dl-ssl.google.com/android/repository/ + https://dl.google.com/android/repository/ diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index aa1e05e85a0..c31e81f4bf8 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -11,7 +11,7 @@ sysimg__ = buildSystemImage { name = "sysimg--"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/; + url = https://dl.google.com/android/repository/sys-img/android/; sha1 = ""; }; }; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 1be54adaaed..d217d57643d 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,20 +1,16 @@ {stdenv, stdenv_32bit, fetchurl, unzip}: -let - version = "22"; - -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "23.0.1"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "1kbp5fzfdas6c431n53a9w0z0182ihhadd1h8a64m1alkw0swr41"; + url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; + sha1 = "94dcc5072b3d0d74cc69e4101958b6c2e227e738"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha256 = "0r359xxicn7zw9z0jbrmsppx1372fijg09ck907gg8x1cvzj2ry0"; + url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; + sha1 = "c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index cf509cdff97..cc21ce2dbeb 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -163,7 +163,7 @@ in platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + url = https://dl.google.com/android/repository/android-14_r04.zip; sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { @@ -175,7 +175,7 @@ in platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + url = https://dl.google.com/android/repository/android-15_r05.zip; sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { @@ -187,7 +187,7 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + url = https://dl.google.com/android/repository/android-16_r05.zip; sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { @@ -199,7 +199,7 @@ in platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + url = https://dl.google.com/android/repository/android-17_r03.zip; sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { @@ -211,7 +211,7 @@ in platform_18 = buildPlatform { name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + url = https://dl.google.com/android/repository/android-18_r03.zip; sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { @@ -223,7 +223,7 @@ in platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + url = https://dl.google.com/android/repository/android-19_r04.zip; sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { @@ -235,7 +235,7 @@ in platform_20 = buildPlatform { name = "android-platform-4.4W.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + url = https://dl.google.com/android/repository/android-20_r02.zip; sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; }; meta = { @@ -247,7 +247,7 @@ in platform_21 = buildPlatform { name = "android-platform-5.0.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + url = https://dl.google.com/android/repository/android-21_r02.zip; sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; }; meta = { @@ -259,7 +259,7 @@ in platform_22 = buildPlatform { name = "android-platform-5.1.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + url = https://dl.google.com/android/repository/android-22_r02.zip; sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; }; meta = { @@ -268,4 +268,16 @@ in }; }; + platform_23 = buildPlatform { + name = "android-platform-6.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/android-23_r01.zip; + sha1 = "cbccca8d3127e894845556ce999b28281de541bd"; + }; + meta = { + description = "Android SDK Platform 6.0"; + + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index c9ec3dd6e84..c6d83f71108 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -163,7 +163,7 @@ in platform_14 = buildPlatform { name = "android-platform-4.0"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-14_r04.zip; + url = https://dl.google.com/android/repository/android-14_r04.zip; sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; meta = { @@ -175,7 +175,7 @@ in platform_15 = buildPlatform { name = "android-platform-4.0.3"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-15_r05.zip; + url = https://dl.google.com/android/repository/android-15_r05.zip; sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; meta = { @@ -187,7 +187,7 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r05.zip; + url = https://dl.google.com/android/repository/android-16_r05.zip; sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; meta = { @@ -199,7 +199,7 @@ in platform_17 = buildPlatform { name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r03.zip; + url = https://dl.google.com/android/repository/android-17_r03.zip; sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; meta = { @@ -211,7 +211,7 @@ in platform_18 = buildPlatform { name = "android-platform-4.3.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-18_r03.zip; + url = https://dl.google.com/android/repository/android-18_r03.zip; sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; meta = { @@ -223,7 +223,7 @@ in platform_19 = buildPlatform { name = "android-platform-4.4.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-19_r04.zip; + url = https://dl.google.com/android/repository/android-19_r04.zip; sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; meta = { @@ -235,7 +235,7 @@ in platform_20 = buildPlatform { name = "android-platform-4.4W.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-20_r02.zip; + url = https://dl.google.com/android/repository/android-20_r02.zip; sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; }; meta = { @@ -247,7 +247,7 @@ in platform_21 = buildPlatform { name = "android-platform-5.0.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + url = https://dl.google.com/android/repository/android-21_r02.zip; sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; }; meta = { @@ -259,7 +259,7 @@ in platform_22 = buildPlatform { name = "android-platform-5.1.1"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-22_r02.zip; + url = https://dl.google.com/android/repository/android-22_r02.zip; sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; }; meta = { @@ -268,4 +268,16 @@ in }; }; + platform_23 = buildPlatform { + name = "android-platform-6.0"; + src = fetchurl { + url = https://dl.google.com/android/repository/android-23_r01.zip; + sha1 = "cbccca8d3127e894845556ce999b28281de541bd"; + }; + meta = { + description = "Android SDK Platform 6.0"; + + }; + }; + } diff --git a/pkgs/development/mobile/androidenv/repository-10.xml b/pkgs/development/mobile/androidenv/repository-11.xml similarity index 90% rename from pkgs/development/mobile/androidenv/repository-10.xml rename to pkgs/development/mobile/androidenv/repository-11.xml index fa07307e01e..1495aae4286 100644 --- a/pkgs/development/mobile/androidenv/repository-10.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - + To get started with the Android SDK, you must agree to the following terms and conditions. @@ -285,6 +285,49 @@ June 2014. + + 1 + Android NDK + + + 1083342126 + 6be8598e4ed3d9dd42998c8cb666f0ee502b1294 + https://dl-ssl.google.com/android/repository/android-ndk-r10e-darwin-x86_64.zip + macosx + 64 + + + 1110915721 + f692681b007071103277f6edc6f91cb5c5494a32 + https://dl-ssl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip + linux + 64 + + + 1113873239 + d3510a0e298f6d3b13dc0283bfd92951ccd3a281 + https://dl-ssl.google.com/android/repository/android-ndk-r10e-linux-x86.zip + linux + 32 + + + 1066110352 + a29f3ae41fb02b64ca8ad2b0903f74356f953d9f + https://dl-ssl.google.com/android/repository/android-ndk-r10e-windows-x86_64.zip + windows + 64 + + + 1029711228 + 1d0b8f2835be741f3048fb03c0a3e9f71ab7f357 + https://dl-ssl.google.com/android/repository/android-ndk-r10e-windows-x86.zip + windows + 32 + + + + + 1.1 2 @@ -858,6 +901,29 @@ June 2014. + + + 1 + Android SDK Platform 6.0 + 6.0 + 23 + + 22 + + + 15 + 1 + + + + 70408061 + cbccca8d3127e894845556ce999b28281de541bd + android-23_r01.zip + + + + + @@ -1105,14 +1171,28 @@ June 2014. - - 5 + + 6 22 - 107981157 - dbc5cc27b5d15acc25cd6b94b8c2971806b70bb0 - samples-22_r05.zip + 124512215 + 1f6f4a81a8f19a9b9c9bf4adb64a91330a861c7f + samples-22_r06.zip + + + + + + + + 2 + 23 + + + 127582326 + 94d2857476987cfb7b18c8be61755c21b0a6e599 + samples-23_r02.zip @@ -1121,35 +1201,66 @@ June 2014. - + - 22 + 23 0 - 0 + 1 - 1848028 - 720214bd29d08eb82673cd81a8159b083eef19d7 - platform-tools_r22-windows.zip + 2402978 + 8f32d5f724618ad58e71909cc963ae006d0867b0 + platform-tools_r23.0.1-windows.zip windows - 1751911 - b78be9cc31cf9f9fe0609e29a6a133beacf03b52 - platform-tools_r22-linux.zip + 2520021 + 94dcc5072b3d0d74cc69e4101958b6c2e227e738 + platform-tools_r23.0.1-linux.zip linux - 1743025 - ddc96385bccf8a15d4f8a11eb1cb9d2a08a531c8 - platform-tools_r22-macosx.zip + 2489850 + c461d66f3ca9fbae8ea0fa1a49c203b3b6fd653f + platform-tools_r23.0.1-macosx.zip macosx + + + + 23 + 1 + 0 + 1 + + + + 2594786 + 0467934bfbbb8bd72959f7365e1a3ce2683b68f6 + platform-tools_r23.1_rc1-windows.zip + windows + + + 2873688 + b04d1dbdfd734b0263fb04182e76ff565447f498 + platform-tools_r23.1_rc1-linux.zip + linux + + + 2752137 + c92d9fdfdf79e04a69412492d6480d4f937d1bcc + platform-tools_r23.1_rc1-macosx.zip + macosx + + + + + @@ -1708,35 +1819,97 @@ June 2014. + + + + + 23 + 0 + 0 + + + + + 38570715 + 3874948f35f2f8946597679cc6e9151449f23b5d + build-tools_r23-windows.zip + windows + + + 39080519 + c1d6209212b01469f80fa804e0c1d39a06bc9060 + build-tools_r23-linux.zip + linux + + + 38070540 + 90ba6e716f7703a236cd44b2e71c5ff430855a03 + build-tools_r23-macosx.zip + macosx + + + + + + + + + 23 + 0 + 1 + + + + 38558889 + cc1d37231d228f7a6f130e1f8d8c940052f0f8ab + build-tools_r23.0.1-windows.zip + windows + + + 39069295 + b6ba7c399d5fa487d95289d8832e4ad943aed556 + build-tools_r23.0.1-linux.zip + linux + + + 38059328 + d96ec1522721e9a179ae2c591c99f75d31d39718 + build-tools_r23.0.1-macosx.zip + macosx + + + + + - + 24 - 1 - 2 + 4 + 0 20 - 159505060 - c20ffa023618c5cb6953131d6dbb0c628a3a1a14 - tools_r24.1.2-windows.zip + 197016004 + c3b5d466a8f75d86db79d3c9b8724a4b1d287f5a + tools_r24.4-windows.zip windows - 169061591 - c7c30f6da6eff6323260f0353ccaacc984ea6b3e - tools_r24.1.2-linux.zip + 320385195 + f120858b1f7eedb573608d4ebf16a046d8833024 + tools_r24.4-linux.zip linux - 89081357 - e32ba2fb21cc92ec4f1f01b5cb9a06f666eee460 - tools_r24.1.2-macosx.zip + 101816531 + b83ba3875b4e701b978a11d6506e8997907efca1 + tools_r24.4-macosx.zip macosx @@ -1746,14 +1919,14 @@ June 2014. - + 1 - 22 + 23 - 296467484 - 419791c49fa0a305a06966fd1734cf5b0498ea1a - docs-22_r01.zip + 332171437 + 060ebab2f74861e1ddd9136df26b837312bc087f + docs-23_r01.zip @@ -1888,5 +2061,17 @@ June 2014. + + + 1 + 23 + + + 31771965 + b0f15da2762b42f543c5e364c2b15b198cc99cc2 + sources-23_r01.zip + + + + - diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index c0c2fb47fcd..436936f7c42 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "14"; + version = "21"; name = "android-support-repository-r${version}"; src = fetchurl { - url = "http://dl-ssl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha256 = "027mmfzvs07nbp28vn6c6cgszqdrmmgwdfzda87936lpi5dwg34p"; + url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; + sha1 = "acb915c5d2c730bf98303c0cd0122bedb2954cb3"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index 772ecad8f8a..17125c60dd2 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "22.1.1"; + version = "23.0.1"; name = "android-support-r${version}"; src = fetchurl { - url = "https://dl-ssl.google.com/android/repository/support_r${version}.zip"; - sha1 = "jifv8yjg5jrycf8zd0lfsra00yscggc8"; + url = "https://dl.google.com/android/repository/support_r${version}.zip"; + sha1 = "fbe529716943053d0ce0d7f058d79f1a848cdff9"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index ef6507035f3..66a674042bd 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -436,16 +436,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 2 + + 3 Android SDK Platform 4.0.3 15 armeabi-v7a - 96227377 - 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e - sysimg_armv7a-15_r02.zip + 96240395 + 0a47f586e172b1cf3db2ada857a70c2bdec24ef8 + sysimg_armv7a-15_r03.zip @@ -453,16 +453,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 3 - Android SDK Platform 4.1 + + 4 + Android SDK Platform 4.1.2 16 armeabi-v7a - 112528368 - d1cddb23f17aad5821a089c403d4cddad2cf9ef7 - sysimg_armv7a-16_r03.zip + 112608076 + 39c093ea755098f0ee79f607be7df9e54ba4943f + sysimg_armv7a-16_r04.zip @@ -470,16 +470,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 2 + + 3 Android SDK Platform 4.2.2 17 armeabi-v7a - 116553808 - 1c321cda1af793b84d47d1a8d15f85444d265e3c - sysimg_armv7a-17_r02.zip + 118663847 + 97cfad22b51c8475e228b207dd36dbef1c18fa38 + sysimg_armv7a-17_r03.zip @@ -487,16 +487,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 2 - Android SDK Platform 4.3 + + 3 + Android SDK Platform 4.3.1 18 armeabi-v7a - 125457135 - 4a1a93200210d8c42793324362868846f67401ab - sysimg_armv7a-18_r02.zip + 125503391 + 2d7d51f4d2742744766511e5d6b491bd49161c51 + sysimg_armv7a-18_r03.zip @@ -504,16 +504,16 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - 2 - Android SDK Platform 4.4.2 + + 3 + Android SDK Platform 4.4.4 19 armeabi-v7a - 158478012 - e0d375397e28e3d5d9577a00132463a4696248e5 - sysimg_armv7a-19_r02.zip + 159399028 + 5daf7718e3ab03d9bd8792b492dd305f386ef12f + sysimg_armv7a-19_r03.zip @@ -537,19 +537,36 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS + + + 1 + Android SDK Platform 5.1 + 22 + armeabi-v7a + default + + + 193687339 + 2aa6a887ee75dcf3ac34627853d561997792fcb8 + sysimg_arm-22_r01.zip + + + + + Android SDK Platform 2.3.7 - 2 + 3 10 x86 - 55463895 - 34e2436f69606cdfe35d3ef9112f0c64e3ff021d - https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip + 66997702 + 6b8539eaca9685d2d3289bf8e6d21d366d791326 + sysimg_x86-10_r03.zip default @@ -557,15 +574,15 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS Android SDK Platform 4.0.4 - 1 + 2 15 x86 - 112619605 - d540325952e0f097509622b9e685737584b83e40 - https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip + 109019058 + 56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f + sysimg_x86-15_r02.zip default @@ -573,63 +590,65 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS Android SDK Platform 4.1.1 - 1 + 2 16 x86 - 131840348 - 9d35bcaa4f9b40443941f32b8a50337f413c021a - https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip + 135252264 + 36c2a2e394bcb3290583ce09815eae7711d0b2c2 + sysimg_x86-16_r02.zip default - Android SDK Platform 4.2 - 1 + + 2 + Android SDK Platform 4.2.2 17 x86 - + - 138799122 - ddb3313e8dcd07926003f7b828eafea1115ea35b - https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip + 136075512 + bd8c7c5411431af7e051cbe961be430fc31e773d + sysimg_x86-17_r02.zip default - Android SDK Platform 4.3 - 1 + + 2 + Android SDK Platform 4.3.1 18 x86 - + - 155656419 - f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1 - https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip + 143899902 + ab3de121a44fca43ac3aa83f7d68cc47fc643ee8 + sysimg_x86-18_r02.zip default - - 2 - Android SDK Platform 4.4.2 + + 3 + Android SDK Platform 4.4.4 19 x86 - 178922720 - 8889cb418984a2a7916a359da7c429d2431ed060 - sysimg_x86-19_r02.zip + 180245668 + 3782f3ebac5e54b3de454570add401989515ffca + sysimg_x86-19_r03.zip @@ -704,22 +723,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS - - - 1 - Android SDK Platform 5.1 - 22 - armeabi-v7a - default - - - 193687339 - 2aa6a887ee75dcf3ac34627853d561997792fcb8 - sysimg_arm-22_r01.zip - - - - @@ -776,4 +779,54 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default + + + 3 + Android SDK Platform 6.0 + 23 + x86 + default + + + 240896796 + 3cb2e8efb575c35a558b091eac7e1bc5843f5f12 + sysimg_x86-23_r03.zip + + + + + + + + 3 + Android SDK Platform 6.0 + 23 + x86_64 + default + + + 337897181 + 226510856431bc4a73690540a8d7cbad974bedd3 + sysimg_x86_64-23_r03.zip + + + + + + + + 3 + Android SDK Platform 6.0 + 23 + armeabi-v7a + default + + + 226879660 + 7bb8768ec4333500192fd9627d4234f505fa98dc + sysimg_arm-23_r03.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 83ca0d49830..82bfce7a62f 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -18,7 +18,7 @@ in sysimg_armeabi-v7a_14 = buildSystemImage { name = "sysimg-armeabi-v7a-14"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; }; }; @@ -26,103 +26,111 @@ in sysimg_armeabi-v7a_15 = buildSystemImage { name = "sysimg-armeabi-v7a-15"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r02.zip; - sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip; + sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8"; }; }; sysimg_armeabi-v7a_16 = buildSystemImage { name = "sysimg-armeabi-v7a-16"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r03.zip; - sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; + sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; }; }; sysimg_armeabi-v7a_17 = buildSystemImage { name = "sysimg-armeabi-v7a-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r02.zip; - sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip; + sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38"; }; }; sysimg_armeabi-v7a_18 = buildSystemImage { name = "sysimg-armeabi-v7a-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r02.zip; - sha1 = "4a1a93200210d8c42793324362868846f67401ab"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip; + sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51"; }; }; sysimg_armeabi-v7a_19 = buildSystemImage { name = "sysimg-armeabi-v7a-19"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r02.zip; - sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip; + sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f"; }; }; sysimg_armeabi-v7a_21 = buildSystemImage { name = "sysimg-armeabi-v7a-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip; sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a"; }; }; + sysimg_armeabi-v7a_22 = buildSystemImage { + name = "sysimg-armeabi-v7a-22"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; + sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; + }; + }; + sysimg_x86_10 = buildSystemImage { name = "sysimg-x86-10"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip; - sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip; + sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326"; }; }; sysimg_x86_15 = buildSystemImage { name = "sysimg-x86-15"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip; - sha1 = "d540325952e0f097509622b9e685737584b83e40"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip; + sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f"; }; }; sysimg_x86_16 = buildSystemImage { name = "sysimg-x86-16"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip; - sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip; + sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2"; }; }; sysimg_x86_17 = buildSystemImage { name = "sysimg-x86-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip; - sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip; + sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d"; }; }; sysimg_x86_18 = buildSystemImage { name = "sysimg-x86-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip; - sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip; + sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8"; }; }; sysimg_x86_19 = buildSystemImage { name = "sysimg-x86-19"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-19_r02.zip; - sha1 = "8889cb418984a2a7916a359da7c429d2431ed060"; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r03.zip; + sha1 = "3782f3ebac5e54b3de454570add401989515ffca"; }; }; sysimg_x86_21 = buildSystemImage { name = "sysimg-x86-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip; sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f"; }; }; @@ -130,7 +138,7 @@ in sysimg_x86_64_21 = buildSystemImage { name = "sysimg-x86_64-21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip; sha1 = "2f205b728695d84488156f4846beb83a353ea64b"; }; }; @@ -138,7 +146,7 @@ in sysimg_x86_22 = buildSystemImage { name = "sysimg-x86-22"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip; sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15"; }; }; @@ -146,23 +154,15 @@ in sysimg_x86_64_22 = buildSystemImage { name = "sysimg-x86_64-22"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip; sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae"; }; }; - sysimg_armeabi-v7a_22 = buildSystemImage { - name = "sysimg-armeabi-v7a-22"; - src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip; - sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8"; - }; - }; - sysimg_mips_15 = buildSystemImage { name = "sysimg-mips-15"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip; sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; }; }; @@ -170,7 +170,7 @@ in sysimg_mips_16 = buildSystemImage { name = "sysimg-mips-16"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; }; }; @@ -178,8 +178,32 @@ in sysimg_mips_17 = buildSystemImage { name = "sysimg-mips-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; + url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; }; }; + + sysimg_x86_23 = buildSystemImage { + name = "sysimg-x86-23"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r03.zip; + sha1 = "3cb2e8efb575c35a558b091eac7e1bc5843f5f12"; + }; + }; + + sysimg_x86_64_23 = buildSystemImage { + name = "sysimg-x86_64-23"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r03.zip; + sha1 = "226510856431bc4a73690540a8d7cbad974bedd3"; + }; + }; + + sysimg_armeabi-v7a_23 = buildSystemImage { + name = "sysimg-armeabi-v7a-23"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip; + sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc"; + }; + }; }